commit ece6c8b20b7bcfa0734c2fd4cd3fc93bc227699f
author Sunny Goyal <sunnygoyal@google.com> Mon Apr 13 11:47:00 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Apr 13 11:48:46 2015 -0700
tree ce832db9b7c7520d86e3931d95093d4fe09ddadd
parent 18bf8e2ffde3444d53aaa9654da02cdedd0b7cd1

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

Bug: 20163841
Change-Id: Ief91db56f7831f89e34c4540981a9d2db96b8bed

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());
         }