Merge "Remove everything from under the lock." into sc-dev am: 4895062eac am: da61285b2e (fb5bcb43) · Commits · e / os / android_frameworks_base

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

+13 −14

Original line number	Diff line number	Diff line
		@@ -9556,11 +9556,7 @@ public class PackageManagerService extends IPackageManager.Stub

		@Override
		public boolean isProtectedBroadcast(String actionName) {
		// allow instant applications
		synchronized (mProtectedBroadcasts) {
		if (mProtectedBroadcasts.contains(actionName)) {
		return true;
		} else if (actionName != null) {
		if (actionName != null) {
		// TODO: remove these terrible hacks
		if (actionName.startsWith("android.net.netmon.lingerExpired")
		\|\| actionName.startsWith("com.android.server.sip.SipWakeupTimer")
		@@ -9569,8 +9565,10 @@ public class PackageManagerService extends IPackageManager.Stub
		return true;
		}
		}
		// allow instant applications
		synchronized (mProtectedBroadcasts) {
		return mProtectedBroadcasts.contains(actionName);
		}
		return false;
		}

		@Override
		@@ -15215,9 +15213,10 @@ public class PackageManagerService extends IPackageManager.Stub
		if (DEBUG_PACKAGE_SCANNING) Log.d(TAG, " Instrumentation: " + r);
		}

		if (!pkg.getProtectedBroadcasts().isEmpty()) {
		final List<String> protectedBroadcasts = pkg.getProtectedBroadcasts();
		if (!protectedBroadcasts.isEmpty()) {
		synchronized (mProtectedBroadcasts) {
		mProtectedBroadcasts.addAll(pkg.getProtectedBroadcasts());
		mProtectedBroadcasts.addAll(protectedBroadcasts);
		}
		}