Fixing shortcut intent getting cleared during backup/restore

Bug: 174570283
Bug: 156871815
Test: Verified on device
Change-Id: Ie286ee783bfe96c5b2be28f0db5298caf3801e6d
This commit is contained in:
Sunny Goyal
2021-02-11 16:47:26 -08:00
parent 2268d7a937
commit 4c23ca768f
8 changed files with 42 additions and 20 deletions

View File

@@ -15,7 +15,7 @@
*/
package com.android.launcher3.model;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -72,9 +72,9 @@ public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
synchronized (dataModel) {
final HashSet<ItemInfo> updates = new HashSet<>();
dataModel.forAllWorkspaceItemInfos(mInstallInfo.user, si -> {
ComponentName cn = si.getTargetComponent();
if (si.hasPromiseIconUi() && (cn != null)
&& cn.getPackageName().equals(mInstallInfo.packageName)) {
Intent intent = si.getIntent();
if (si.hasPromiseIconUi() && (intent != null)
&& mInstallInfo.packageName.equals(intent.getPackage())) {
int installProgress = mInstallInfo.progress;
si.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING);