commit e48e570a82293d34e955b966c7821770600ec7bf
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 16 00:50:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 16 00:50:18 2015 +0000
tree 6a9230f629de260c81e1748bacf4d284cd896023
parent eb01b967460d0d8287042e5f6dd16578f3f59eb6
parent 7fb55d25e3c183cb39e6b96e6ffbb3cd8a706ede

Merge "[Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user" into ub-launcher3-almonte

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index ee35457..1a341e7 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2215,6 +2215,12 @@
 
                                 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 @@
                                 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 @@
                                     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);