Merge "am:fix the dead lock." into main (6d444f1a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/AppRestrictionController.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@ public final class AppRestrictionController {
		/**
		* Cache the package name and information about if it's a system module.
		*/
		@GuardedBy("mLock")
		@GuardedBy("mSystemModulesCache")
		private final HashMap<String, Boolean> mSystemModulesCache = new HashMap<>();

		/**
		@@ -1588,7 +1588,7 @@ public final class AppRestrictionController {
		if (moduleInfos == null) {
		return;
		}
		synchronized (mLock) {
		synchronized (mSystemModulesCache) {
		for (ModuleInfo info : moduleInfos) {
		mSystemModulesCache.put(info.getPackageName(), Boolean.TRUE);
		}
		@@ -1596,7 +1596,7 @@ public final class AppRestrictionController {
		}

		private boolean isSystemModule(String packageName) {
		synchronized (mLock) {
		synchronized (mSystemModulesCache) {
		final Boolean val = mSystemModulesCache.get(packageName);
		if (val != null) {
		return val.booleanValue();
		@@ -1624,7 +1624,7 @@ public final class AppRestrictionController {
		}
		}
		// Update the cache.
		synchronized (mLock) {
		synchronized (mSystemModulesCache) {
		mSystemModulesCache.put(packageName, isSystemModule);
		}
		return isSystemModule;