Merge "Lock on ResourcesManager when cleaning references" (dead70a0) · Commits · e / os / android_frameworks_base

core/java/android/app/ResourcesManager.java

+16 −13

Original line number	Diff line number	Diff line
		@@ -884,8 +884,10 @@ public class ResourcesManager {
		* @param activityToken optional token to clean up Activity resources
		*/
		private void cleanupReferences(IBinder activityToken) {
		synchronized (this) {
		if (activityToken != null) {
		ActivityResources activityResources = mActivityResourceReferences.get(activityToken);
		ActivityResources activityResources = mActivityResourceReferences.get(
		activityToken);
		if (activityResources != null) {
		ArrayUtils.unstableRemoveIf(activityResources.activityResources,
		sEmptyReferencePredicate);
		@@ -902,6 +904,7 @@ public class ResourcesManager {
		}
		}
		}
		}

		/**
		* Creates a Resources object set with a ResourcesImpl object matching the given key.