commit 195e939a936d00ab87326e44ca5f8e5b6b03b812
author Sunny Goyal <sunnygoyal@google.com> Mon Apr 13 20:29:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 13 20:29:03 2015 +0000
tree a11109ffe85d8b0d76322814cc2a8c26162383db
parent 084212c2854102a92a44fc9b7d1edf4007a0aa71
parent ece6c8b20b7bcfa0734c2fd4cd3fc93bc227699f

am ece6c8b2: Wrong icon getting set for an app on secondary user during updates

* commit 'ece6c8b20b7bcfa0734c2fd4cd3fc93bc227699f':
  Wrong icon getting set for an app on secondary user during updates

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index f6238da..48b38f1 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -283,8 +283,8 @@
             }
             ContentValues values = updateCacheAndGetContentValues(app);
             mIconDb.getWritableDatabase().update(IconDB.TABLE_NAME, values,
-                    IconDB.COLUMN_COMPONENT + " = ?",
-                    new String[] { cn });
+                    IconDB.COLUMN_COMPONENT + " = ? AND " + IconDB.COLUMN_USER + " = ?",
+                    new String[] {cn, Long.toString(userSerial)});
 
             updatedPackages.add(component.getPackageName());
         }