Fix bug with user of shortcut not being remembered over restart.

Intent extra was being set as int rather than long so being
missed.
Also use LauncherApps if neccessary in case where launching
without launch animation.
Unregister for package notifications when terminating.

Bug: 14636181
Change-Id: I1575f6eed806446782092dffe8c01afe7b6507fe
This commit is contained in:
Kenny Guy
2014-05-08 18:52:50 +01:00
parent 2e7db96278
commit 1317e2dd4a
3 changed files with 20 additions and 15 deletions

View File

@@ -902,7 +902,7 @@ public class LauncherModel extends BroadcastReceiver
item.container = c.getInt(containerIndex);
item.itemType = c.getInt(itemTypeIndex);
item.screenId = c.getInt(screenIndex);
int serialNumber = c.getInt(profileIdIndex);
long serialNumber = c.getInt(profileIdIndex);
item.user = userManager.getUserForSerialNumber(serialNumber);
// Skip if user has been deleted.
if (item.user != null) {
@@ -1894,7 +1894,7 @@ public class LauncherModel extends BroadcastReceiver
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
id = c.getLong(idIndex);
intentDescription = c.getString(intentIndex);
int serialNumber = c.getInt(profileIdIndex);
long serialNumber = c.getInt(profileIdIndex);
user = mUserManager.getUserForSerialNumber(serialNumber);
if (user == null) {
// User has been deleted remove the item.