commit 6a7eec509af0b09cec698702ce0746bcb805a90c
author Winson <winsonc@google.com> Sat Aug 08 02:49:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 08 02:49:47 2015 +0000
tree 55ae08ec056b6030e341242483d6a58542616e0c
parent 7bbaae6a31efe8f83bb20f47c60a65b3175c90a9
parent 3d648a71daf4b4f2555f023a5007ef20ee4d65a4

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

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

src/com/android/launcher2/AllAppsList.java

diff --git a/src/com/android/launcher2/AllAppsList.java b/src/com/android/launcher2/AllAppsList.java
index 11c7559..0ffab39 100644
--- a/src/com/android/launcher2/AllAppsList.java
+++ b/src/com/android/launcher2/AllAppsList.java
@@ -130,7 +130,7 @@
                         && 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 @@
                     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 @@
                 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

diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 84fed5f..2074610 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -160,9 +160,9 @@
     /**
      * 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));
         }
     }