Fixing shortcuts not getting migrated to app icons (c22841bf) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/LauncherModel.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1999,7 +1999,7 @@ public class LauncherModel extends BroadcastReceiver
		"constructing info for partially restored package",
		true);
		info = getRestoredItemInfo(c, titleIndex, intent,
		promiseType, cursorIconInfo, context);
		promiseType, itemType, cursorIconInfo, context);
		intent = getRestoredItemIntent(c, context, intent);
		} else {
		// Don't restore items for other profiles.
		@@ -3380,7 +3380,7 @@ public class LauncherModel extends BroadcastReceiver
		* to a package that is not yet installed on the system.
		*/
		public ShortcutInfo getRestoredItemInfo(Cursor c, int titleIndex, Intent intent,
		int promiseType, CursorIconInfo iconInfo, Context context) {
		int promiseType, int itemType, CursorIconInfo iconInfo, Context context) {
		final ShortcutInfo info = new ShortcutInfo();
		info.user = UserHandleCompat.myUserHandle();

		@@ -3406,7 +3406,7 @@ public class LauncherModel extends BroadcastReceiver
		}

		info.contentDescription = mUserManager.getBadgedLabelForUser(info.title, info.user);
		info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
		info.itemType = itemType;
		info.promisedIntent = intent;
		info.status = promiseType;
		return info;

+1 −1

Original line number	Diff line number	Diff line
		@@ -772,7 +772,7 @@ public class LauncherProvider extends ContentProvider {

		long id = c.getLong(idIndex);
		updateStmt.bindLong(1, id);
		updateStmt.execute();
		updateStmt.executeUpdateDelete();
		}
		db.setTransactionSuccessful();
		} catch (SQLException ex) {