diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-05-16 12:06:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 12:06:01 +0000 |
| commit | 7cfce9464e40fbd1e7b6308d6356da27a7082c81 (patch) | |
| tree | a97c7b20718808adf0e8a88198e7d62ad40f4b33 /src/com | |
| parent | 97dd8c21efa751ebcaeaf4f10f40450bfa245f69 (diff) | |
| parent | f8b1dfd293430f32ace939d2fa78f3059cb7bb2f (diff) | |
| download | android_packages_apps_Trebuchet-7cfce9464e40fbd1e7b6308d6356da27a7082c81.tar.gz android_packages_apps_Trebuchet-7cfce9464e40fbd1e7b6308d6356da27a7082c81.tar.bz2 android_packages_apps_Trebuchet-7cfce9464e40fbd1e7b6308d6356da27a7082c81.zip | |
Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 81ced7b3b..ea14753d8 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -819,9 +819,15 @@ public class LauncherBackupHelper implements BackupHelper { if (!TextUtils.isEmpty(title)) { favorite.title = title; } - String intent = c.getString(INTENT_INDEX); - if (!TextUtils.isEmpty(intent)) { - favorite.intent = intent; + String intentDescription = c.getString(INTENT_INDEX); + if (!TextUtils.isEmpty(intentDescription)) { + try { + Intent intent = Intent.parseUri(intentDescription, 0); + intent.removeExtra(ItemInfo.EXTRA_PROFILE); + favorite.intent = intent.toUri(0); + } catch (URISyntaxException e) { + Log.e(TAG, "Invalid intent", e); + } } favorite.itemType = c.getInt(ITEM_TYPE_INDEX); if (favorite.itemType == Favorites.ITEM_TYPE_APPWIDGET) { @@ -874,6 +880,11 @@ public class LauncherBackupHelper implements BackupHelper { values.put(Favorites.APPWIDGET_ID, favorite.appWidgetId); } + UserHandleCompat myUserHandle = UserHandleCompat.myUserHandle(); + long userSerialNumber = + UserManagerCompat.getInstance(mContext).getSerialNumberForUser(myUserHandle); + values.put(LauncherSettings.Favorites.PROFILE_ID, userSerialNumber); + // Let LauncherModel know we've been here. values.put(LauncherSettings.Favorites.RESTORED, 1); |