Merge "Use MATCH_ANY_USER when retrieving PackageInfo." into rvc-qpr-dev

This commit is contained in:
Nicholas Sauer
2020-09-22 21:33:17 +00:00
committed by Android (Google) Code Review

View File

@@ -2313,7 +2313,8 @@ class PackageManagerShellCommand extends ShellCommand {
private boolean isVendorApp(String pkg) {
try {
final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);
final PackageInfo info = mInterface.getPackageInfo(
pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);
return info != null && info.applicationInfo.isVendor();
} catch (RemoteException e) {
return false;
@@ -2322,7 +2323,8 @@ class PackageManagerShellCommand extends ShellCommand {
private boolean isProductApp(String pkg) {
try {
final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);
final PackageInfo info = mInterface.getPackageInfo(
pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);
return info != null && info.applicationInfo.isProduct();
} catch (RemoteException e) {
return false;
@@ -2331,7 +2333,8 @@ class PackageManagerShellCommand extends ShellCommand {
private boolean isSystemExtApp(String pkg) {
try {
final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);
final PackageInfo info = mInterface.getPackageInfo(
pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);
return info != null && info.applicationInfo.isSystemExt();
} catch (RemoteException e) {
return false;