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

This commit is contained in:
TreeHugger Robot
2018-03-06 11:50:23 +00:00
committed by Android (Google) Code Review

View File

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