Merge "Don't hold lock when calling externally" into nyc-dev (1415d267) · Commits · e / os / android_frameworks_base

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

+12 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2050,9 +2050,11 @@ public class PackageManagerService extends IPackageManager.Stub {
	final int immutableFlags = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED		final int immutableFlags = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED
	\| PackageManager.FLAG_PERMISSION_POLICY_FIXED;		\| PackageManager.FLAG_PERMISSION_POLICY_FIXED;

	synchronized (mPackages) {
	for (String permission : pkg.requestedPermissions) {		for (String permission : pkg.requestedPermissions) {
	BasePermission bp = mSettings.mPermissions.get(permission);		final BasePermission bp;
			synchronized (mPackages) {
			bp = mSettings.mPermissions.get(permission);
			}
	if (bp != null && (bp.isRuntime() \|\| bp.isDevelopment())		if (bp != null && (bp.isRuntime() \|\| bp.isDevelopment())
	&& (grantedPermissions == null		&& (grantedPermissions == null
	\|\| ArrayUtils.contains(grantedPermissions, permission))) {		\|\| ArrayUtils.contains(grantedPermissions, permission))) {
	@@ -2064,7 +2066,6 @@ public class PackageManagerService extends IPackageManager.Stub {
	}		}
	}		}
	}		}
	}

	Bundle extrasForInstallResult(PackageInstalledInfo res) {		Bundle extrasForInstallResult(PackageInstalledInfo res) {
	Bundle extras = null;		Bundle extras = null;