Merge "Clear calling identity when calling getPackageInfo in AMS.isSystemUid" (031d138d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/accounts/AccountManagerService.java

+16 −15

Original line number	Diff line number	Diff line
		@@ -5595,13 +5595,11 @@ public class AccountManagerService
		long ident = Binder.clearCallingIdentity();
		try {
		packages = mPackageManager.getPackagesForUid(callingUid);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		if (packages != null) {
		for (String name : packages) {
		try {
		PackageInfo packageInfo = mPackageManager.getPackageInfo(name, 0 /* flags */);
		PackageInfo packageInfo =
		mPackageManager.getPackageInfo(name, 0 /* flags */);
		if (packageInfo != null
		&& (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
		!= 0) {
		@@ -5614,6 +5612,9 @@ public class AccountManagerService
		} else {
		Log.w(TAG, "No known packages with uid " + callingUid);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		return false;
		}