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

Commit a9c56d53 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Don't whitelist all system image apps." into pi-dev 

am: 3fbc54e6

Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d
parents 899db63d 3fbc54e6

core/java/android/content/pm/ApplicationInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
            if (category != CATEGORY_UNDEFINED) {

                pw.println(prefix + "category=" + category);

            }

            pw.println("isAllowedToUseHiddenApi=" + isAllowedToUseHiddenApi());

        }

        super.dumpBack(pw, prefix);

    }
@@ -1604,8 +1605,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    public boolean isAllowedToUseHiddenApi() {

        boolean whitelisted =

                SystemConfig.getInstance().getHiddenApiWhitelistedApps().contains(packageName);

        return isSystemApp() || // TODO get rid of this once the whitelist has been populated

                (whitelisted && (isSystemApp() || isUpdatedSystemApp()));

        return whitelisted && (isSystemApp() || isUpdatedSystemApp());

    }



    /**