Merge "Fixing shortcut intent getting cleared during backup/restore" into sc-dev (40ff7e4e) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Utilities.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -605,7 +605,6 @@ public final class Utilities {
		outObj[0] = activityInfo;
		return activityInfo.getFullResIcon(appState.getIconCache());
		}
		if (info.getIntent() == null \|\| info.getIntent().getPackage() == null) return null;
		List<ShortcutInfo> si = ShortcutKey.fromItemInfo(info)
		.buildRequest(launcher)
		.query(ShortcutRequest.ALL);

src/com/android/launcher3/model/AllAppsList.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static com.android.launcher3.model.data.AppInfo.EMPTY_ARRAY;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.LauncherActivityInfo;
		import android.content.pm.LauncherApps;
		import android.os.LocaleList;
		@@ -145,10 +144,9 @@ public class AllAppsList {
		}

		public void addPromiseApp(Context context, PackageInstallInfo installInfo) {
		ApplicationInfo applicationInfo = new PackageManagerHelper(context)
		.getApplicationInfo(installInfo.packageName, installInfo.user, 0);
		// only if not yet installed
		if (applicationInfo == null) {
		if (!new PackageManagerHelper(context)
		.isAppInstalled(installInfo.packageName, installInfo.user)) {
		AppInfo info = new AppInfo(installInfo);
		mIconCache.getTitleAndIcon(info, info.usingLowResIcon());
		info.sectionName = mIndex.computeSectionName(info.title);

src/com/android/launcher3/model/PackageIncrementalDownloadUpdatedTask.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/
		package com.android.launcher3.model;

		import android.content.ComponentName;
		import android.content.Intent;
		import android.os.UserHandle;

		import com.android.launcher3.LauncherAppState;
		@@ -66,8 +66,8 @@ public class PackageIncrementalDownloadUpdatedTask extends BaseModelUpdateTask {
		final ArrayList<WorkspaceItemInfo> updatedWorkspaceItems = new ArrayList<>();
		synchronized (dataModel) {
		dataModel.forAllWorkspaceItemInfos(mUser, si -> {
		ComponentName cn = si.getTargetComponent();
		if ((cn != null) && cn.getPackageName().equals(mPackageName)) {
		Intent intent = si.getIntent();
		if ((intent != null) && mPackageName.equals(intent.getPackage())) {
		si.runtimeStatusFlags &= ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
		si.setProgressLevel(downloadInfo);
		updatedWorkspaceItems.add(si);

src/com/android/launcher3/model/PackageInstallStateChangedTask.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);

src/com/android/launcher3/model/PackageUpdatedTask.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.os.UserManager;
		import android.util.Log;

		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.LauncherSettings;
		import com.android.launcher3.LauncherSettings.Favorites;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.icons.BitmapInfo;
		@@ -228,7 +229,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
		isTargetValid = context.getSystemService(LauncherApps.class)
		.isActivityEnabled(cn, mUser);
		}
		if (si.hasStatusFlag(FLAG_RESTORED_ICON \| FLAG_AUTOINSTALL_ICON)) {
		if (!isTargetValid && si.hasStatusFlag(
		FLAG_RESTORED_ICON \| FLAG_AUTOINSTALL_ICON)) {
		if (updateWorkspaceItemIntent(context, si, packageName)) {
		infoUpdated = true;
		} else if (si.hasPromiseIconUi()) {
		@@ -250,8 +252,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
		}
		}

		if (isNewApkAvailable
		&& si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
		if (isNewApkAvailable) {
		List<LauncherActivityInfo> activities = activitiesLists.get(
		packageName);
		si.setProgressLevel(
		@@ -260,9 +261,11 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
		: PackageManagerHelper.getLoadingProgress(
		activities.get(0)),
		PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
		if (si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
		iconCache.getTitleAndIcon(si, si.usingLowResIcon());
		infoUpdated = true;
		}
		}

		int oldRuntimeFlags = si.runtimeStatusFlags;
		si.runtimeStatusFlags = flagOp.apply(si.runtimeStatusFlags);
		@@ -353,6 +356,11 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
		*/
		private boolean updateWorkspaceItemIntent(Context context,
		WorkspaceItemInfo si, String packageName) {
		if (si.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
		// Do not update intent for deep shortcuts as they contain additional information
		// about the shortcut.
		return false;
		}
		// Try to find the best match activity.
		Intent intent = new PackageManagerHelper(context).getAppLaunchIntent(packageName, mUser);
		if (intent != null) {