am baa8510f: am ef423f7f: am 53f6b7b3: Fixing issue where app icons were not...

am baa8510f: am ef423f7f: am 53f6b7b3: Fixing issue where app icons were not updating with the package.

* commit 'baa8510f':
  Fixing issue where app icons were not updating with the package.

src/com/android/launcher2/AllAppsList.java

@@ -130,7 +130,7 @@ class AllAppsList {
                         && packageName.equals(component.getPackageName())) {
                     if (!findActivity(matches, component, user)) {
                         removed.add(applicationInfo);
-                        mIconCache.remove(component);
+                        mIconCache.remove(component, user);
                         data.remove(i);
                     }
                 }
@@ -149,7 +149,7 @@ class AllAppsList {
                     add(new ApplicationInfo(info, user,
                             mIconCache, null));
                 } else {
-                    mIconCache.remove(applicationInfo.componentName);
+                    mIconCache.remove(applicationInfo.componentName, user);
                     mIconCache.getTitleAndIcon(applicationInfo, info, null);
                     modified.add(applicationInfo);
                 }
@@ -162,7 +162,7 @@ class AllAppsList {
                 if (user.equals(applicationInfo.user)
                         && packageName.equals(component.getPackageName())) {
                     removed.add(applicationInfo);
-                    mIconCache.remove(component);
+                    mIconCache.remove(component, user);
                     data.remove(i);
                 }
             }

src/com/android/launcher2/IconCache.java

@@ -160,9 +160,9 @@ public class IconCache {
     /**
      * Remove any records for the supplied ComponentName.
      */
-    public void remove(ComponentName componentName) {
+    public void remove(ComponentName componentName, UserHandle user) {
         synchronized (mCache) {
-            mCache.remove(componentName);
+            mCache.remove(new CacheKey(componentName, user));
         }
     }