Merge "Use MATCH_ANY_USER when retrieving PackageInfo." into rvc-qpr-dev (1688d946) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;