summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-07-16 00:50:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-16 00:50:18 +0000
commite48e570a82293d34e955b966c7821770600ec7bf (patch)
tree6a9230f629de260c81e1748bacf4d284cd896023
parenteb01b967460d0d8287042e5f6dd16578f3f59eb6 (diff)
parent7fb55d25e3c183cb39e6b96e6ffbb3cd8a706ede (diff)
downloadandroid_packages_apps_Trebuchet-e48e570a82293d34e955b966c7821770600ec7bf.tar.gz
android_packages_apps_Trebuchet-e48e570a82293d34e955b966c7821770600ec7bf.tar.bz2
android_packages_apps_Trebuchet-e48e570a82293d34e955b966c7821770600ec7bf.zip
Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-almonte
-rw-r--r--src/com/android/launcher3/LauncherModel.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index ee35457b7..1a341e776 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2215,6 +2215,12 @@ public class LauncherModel extends BroadcastReceiver
int appWidgetId = c.getInt(appWidgetIdIndex);
serialNumber= c.getLong(profileIdIndex);
+ user = mUserManager.getUserForSerialNumber(serialNumber);
+ if (user == null) {
+ // User has been deleted remove the item.
+ itemsToRemove.add(id);
+ continue;
+ }
String savedProvider = c.getString(appWidgetProviderIndex);
id = c.getLong(idIndex);
final ComponentName component =
@@ -2230,7 +2236,7 @@ public class LauncherModel extends BroadcastReceiver
final LauncherAppWidgetProviderInfo provider =
LauncherModel.getProviderInfo(context,
ComponentName.unflattenFromString(savedProvider),
- mUserManager.getUserForSerialNumber(serialNumber));
+ user);
final boolean isProviderReady = isValidProvider(provider);
if (!isSafeMode && !customWidget &&
@@ -2295,6 +2301,7 @@ public class LauncherModel extends BroadcastReceiver
appWidgetInfo.cellY = c.getInt(cellYIndex);
appWidgetInfo.spanX = c.getInt(spanXIndex);
appWidgetInfo.spanY = c.getInt(spanYIndex);
+ appWidgetInfo.user = user;
if (!customWidget) {
int[] minSpan = Launcher.getMinSpanForWidget(context, provider);