Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c10c014a authored by Sunny Goyal's avatar Sunny Goyal Committed by Android Git Automerger
Browse files

am 066bcc05: Merge "Using GET_UNINSTALLED_PACKAGES flag when getting... 

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

* commit '066bcc05':
  Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app
parents 3eefff8d 066bcc05

src/com/android/launcher3/IconCache.java

+4 −2
Original line number Diff line number Diff line
@@ -616,7 +616,9 @@ public class IconCache { 
            // 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 @@ public class IconCache { 
    }



    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";