Merge "[res] Double checked locking in ResourcesManager" into main (9134b213) · Commits · e / os / android_frameworks_base

core/java/android/app/ResourcesManager.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ public class ResourcesManager {
		static final String TAG = "ResourcesManager";
		private static final boolean DEBUG = false;

		private static ResourcesManager sResourcesManager;
		private static volatile ResourcesManager sResourcesManager;

		/**
		* Internal lock object
		@@ -359,17 +359,20 @@ public class ResourcesManager {
		sResourcesManager = resourcesManager;
		return oldResourceManager;
		}

		}

		@UnsupportedAppUsage
		public static ResourcesManager getInstance() {
		var rm = sResourcesManager;
		if (rm == null) {
		synchronized (ResourcesManager.class) {
		if (sResourcesManager == null) {
		sResourcesManager = new ResourcesManager();
		rm = sResourcesManager;
		if (rm == null) {
		sResourcesManager = rm = new ResourcesManager();
		}
		}
		return sResourcesManager;
		}
		return rm;
		}

		/**