Don't clobber widgets with the same component.

By not storing them in a HashMap keyed against ComponentName (which is
almost guaranteed to conflict with other widgets when managed profiles
are in play).

Bug: 19444068
Change-Id: I6ffce78e8aaf265196239670404cbdaff9fa09be
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 1e16baf..1359301 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -58,6 +58,7 @@
 import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.util.ComponentKey;
 
 import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
@@ -166,7 +167,7 @@
     static final ArrayList<Long> sBgWorkspaceScreens = new ArrayList<Long>();
 
     // sBgWidgetProviders is the set of widget providers including custom internal widgets
-    public static HashMap<ComponentName, LauncherAppWidgetProviderInfo> sBgWidgetProviders;
+    public static HashMap<ComponentKey, LauncherAppWidgetProviderInfo> sBgWidgetProviders;
 
     // sPendingPackages is a set of packages which could be on sdcard and are not available yet
     static final HashMap<UserHandleCompat, HashSet<String>> sPendingPackages =
@@ -1872,6 +1873,7 @@
                     LauncherAppWidgetInfo appWidgetInfo;
                     int container;
                     long id;
+                    long serialNumber;
                     Intent intent;
                     UserHandleCompat user;
 
@@ -1886,7 +1888,7 @@
                             case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
                                 id = c.getLong(idIndex);
                                 intentDescription = c.getString(intentIndex);
-                                long serialNumber = c.getInt(profileIdIndex);
+                                serialNumber = c.getInt(profileIdIndex);
                                 user = mUserManager.getUserForSerialNumber(serialNumber);
                                 int promiseType = c.getInt(restoredIndex);
                                 int disabledState = 0;
@@ -2150,6 +2152,7 @@
                                     LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
 
                                 int appWidgetId = c.getInt(appWidgetIdIndex);
+                                serialNumber= c.getLong(profileIdIndex);
                                 String savedProvider = c.getString(appWidgetProviderIndex);
                                 id = c.getLong(idIndex);
                                 final ComponentName component =
@@ -2164,7 +2167,8 @@
 
                                 final LauncherAppWidgetProviderInfo provider =
                                         LauncherModel.getProviderInfo(context,
-                                                ComponentName.unflattenFromString(savedProvider));
+                                                ComponentName.unflattenFromString(savedProvider),
+                                                mUserManager.getUserForSerialNumber(serialNumber));
 
                                 final boolean isProviderReady = isValidProvider(provider);
                                 if (!isSafeMode && !customWidget &&
@@ -3283,33 +3287,36 @@
     public static List<LauncherAppWidgetProviderInfo> getWidgetProviders(Context context,
             boolean refresh) {
         synchronized (sBgLock) {
-            if (sBgWidgetProviders != null && !refresh) {
-                return new ArrayList<LauncherAppWidgetProviderInfo>(sBgWidgetProviders.values());
-            }
-            sBgWidgetProviders = new HashMap<ComponentName, LauncherAppWidgetProviderInfo>();
-            List<AppWidgetProviderInfo> widgets =
-                    AppWidgetManagerCompat.getInstance(context).getAllProviders();
-            LauncherAppWidgetProviderInfo info;
-            for (AppWidgetProviderInfo pInfo : widgets) {
-                info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo);
-                sBgWidgetProviders.put(info.provider, info);
-            }
+            if (sBgWidgetProviders == null || refresh) {
+                sBgWidgetProviders = new HashMap<>();
+                AppWidgetManagerCompat wm = AppWidgetManagerCompat.getInstance(context);
+                LauncherAppWidgetProviderInfo info;
 
-            Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values();
-            for (CustomAppWidget widget : customWidgets) {
-                info = new LauncherAppWidgetProviderInfo(context, widget);
-                sBgWidgetProviders.put(info.provider, info);
+                List<AppWidgetProviderInfo> widgets = wm.getAllProviders();
+                for (AppWidgetProviderInfo pInfo : widgets) {
+                    info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo);
+                    UserHandleCompat user = wm.getUser(info);
+                    sBgWidgetProviders.put(new ComponentKey(info.provider, user), info);
+                }
+
+                Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values();
+                for (CustomAppWidget widget : customWidgets) {
+                    info = new LauncherAppWidgetProviderInfo(context, widget);
+                    UserHandleCompat user = wm.getUser(info);
+                    sBgWidgetProviders.put(new ComponentKey(info.provider, user), info);
+                }
             }
             return new ArrayList<LauncherAppWidgetProviderInfo>(sBgWidgetProviders.values());
         }
     }
 
-    public static LauncherAppWidgetProviderInfo getProviderInfo(Context ctx, ComponentName name) {
+    public static LauncherAppWidgetProviderInfo getProviderInfo(Context ctx, ComponentName name,
+            UserHandleCompat user) {
         synchronized (sBgLock) {
             if (sBgWidgetProviders == null) {
                 getWidgetProviders(ctx, false /* refresh */);
             }
-            return sBgWidgetProviders.get(name);
+            return sBgWidgetProviders.get(new ComponentKey(name, user));
         }
     }