commit c10c014a09f20333cec64c4444d55b92b99e7da0
author Sunny Goyal <sunnygoyal@google.com> Fri Aug 28 21:20:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 21:20:30 2015 +0000
tree d92f17bbd9b1f79b9226b727cc3e2f0431e84331
parent 3eefff8d77383b9648378ed68aa98064d98be5c3
parent 066bcc05fb97843dab518e0bc70ae766ed3edf28

am 066bcc05: Merge "Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app" into ub-launcher3-burnaby

* commit '066bcc05fb97843dab518e0bc70ae766ed3edf28':
  Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index ea1c0fd..59ab839 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -616,7 +616,9 @@
             // Check the DB first.
             if (!getEntryFromDB(cacheKey, entry, useLowResIcon)) {
                 try {
-                    PackageInfo info = mPackageManager.getPackageInfo(packageName, 0);
+                    int flags = UserHandleCompat.myUserHandle().equals(user) ? 0 :
+                        PackageManager.GET_UNINSTALLED_PACKAGES;
+                    PackageInfo info = mPackageManager.getPackageInfo(packageName, flags);
                     ApplicationInfo appInfo = info.applicationInfo;
                     if (appInfo == null) {
                         throw new NameNotFoundException("ApplicationInfo is null");
@@ -787,7 +789,7 @@
     }
 
     private static final class IconDB extends SQLiteOpenHelper {
-        private final static int DB_VERSION = 6;
+        private final static int DB_VERSION = 7;
 
         private final static String TABLE_NAME = "icons";
         private final static String COLUMN_ROWID = "rowid";