Merge "Use internal lock for ResourcesManager" into sc-dev am: 75baeda560 am: 965d9e056b (46828012) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public class ResourcesManagerPerfTest {
		while (state.keepRunning()) {
		state.pauseTiming();
		// Invalidate cache.
		resourcesManager.applyConfigurationToResourcesLocked(
		resourcesManager.applyConfigurationToResources(
		resourcesManager.getConfiguration(), null);
		state.resumeTiming();

core/java/android/app/ActivityThread.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -5887,7 +5887,7 @@ public final class ActivityThread extends ClientTransactionHandler

		public final void applyConfigurationToResources(Configuration config) {
		synchronized (mResourcesManager) {
		mResourcesManager.applyConfigurationToResourcesLocked(config, null);
		mResourcesManager.applyConfigurationToResources(config, null);
		}
		}

		@@ -5975,7 +5975,7 @@ public final class ActivityThread extends ClientTransactionHandler

		synchronized (mResourcesManager) {
		// Update all affected Resources objects to use new ResourcesImpl
		mResourcesManager.applyNewResourceDirsLocked(ai, oldResDirs);
		mResourcesManager.applyNewResourceDirs(ai, oldResDirs);
		}
		}

		@@ -6231,7 +6231,7 @@ public final class ActivityThread extends ClientTransactionHandler

		synchronized (mResourcesManager) {
		// Update affected Resources objects to use new ResourcesImpl
		mResourcesManager.applyNewResourceDirsLocked(aInfo, oldResDirs);
		mResourcesManager.applyNewResourceDirs(aInfo, oldResDirs);
		}
		} catch (RemoteException e) {
		}
		@@ -6474,7 +6474,7 @@ public final class ActivityThread extends ClientTransactionHandler
		* reflect configuration changes. The configuration object passed
		* in AppBindData can be safely assumed to be up to date
		*/
		mResourcesManager.applyConfigurationToResourcesLocked(data.config, data.compatInfo);
		mResourcesManager.applyConfigurationToResources(data.config, data.compatInfo);
		mCurDefaultDisplayDpi = data.config.densityDpi;

		// This calls mResourcesManager so keep it within the synchronized block.
		@@ -7509,7 +7509,7 @@ public final class ActivityThread extends ClientTransactionHandler

		// We need to apply this change to the resources immediately, because upon returning
		// the view hierarchy will be informed about it.
		if (mResourcesManager.applyConfigurationToResourcesLocked(globalConfig,
		if (mResourcesManager.applyConfigurationToResources(globalConfig,
		null /* compat */,
		mInitialApplication.getResources().getDisplayAdjustments())) {
		mConfigurationController.updateLocaleListFromAppContext(

core/java/android/app/ConfigurationController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@ class ConfigurationController {
		mCompatConfiguration = new Configuration();
		}
		mCompatConfiguration.setTo(mConfiguration);
		if (mResourcesManager.applyCompatConfigurationLocked(displayDensity,
		mCompatConfiguration)) {
		if (mResourcesManager.applyCompatConfiguration(displayDensity, mCompatConfiguration)) {
		config = mCompatConfiguration;
		}
		return config;
		@@ -199,7 +198,7 @@ class ConfigurationController {
		// configuration also needs to set to the adjustments for consistency.
		appResources.getDisplayAdjustments().getConfiguration().updateFrom(config);
		}
		mResourcesManager.applyConfigurationToResourcesLocked(config, compat,
		mResourcesManager.applyConfigurationToResources(config, compat,
		appResources.getDisplayAdjustments());
		updateLocaleListFromAppContext(app.getApplicationContext());

core/java/android/app/ResourcesManager.java

+118 −112

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@ public class ResourcesManager {

		private static ResourcesManager sResourcesManager;

		/**
		* Internal lock object
		*/
		private final Object mLock = new Object();

		/**
		* The global compatibility settings.
		*/
		@@ -275,7 +280,7 @@ public class ResourcesManager {
		* try as hard as possible to release any open FDs.
		*/
		public void invalidatePath(String path) {
		synchronized (this) {
		synchronized (mLock) {
		int count = 0;

		for (int i = mResourceImpls.size() - 1; i >= 0; i--) {
		@@ -304,7 +309,7 @@ public class ResourcesManager {
		}

		public Configuration getConfiguration() {
		synchronized (this) {
		synchronized (mLock) {
		return mResConfiguration;
		}
		}
		@@ -351,14 +356,16 @@ public class ResourcesManager {
		config.compatSmallestScreenWidthDp = config.smallestScreenWidthDp;
		}

		public boolean applyCompatConfigurationLocked(int displayDensity,
		public boolean applyCompatConfiguration(int displayDensity,
		@NonNull Configuration compatConfiguration) {
		synchronized (mLock) {
		if (mResCompatibilityInfo != null && !mResCompatibilityInfo.supportsScreen()) {
		mResCompatibilityInfo.applyToConfiguration(displayDensity, compatConfiguration);
		return true;
		}
		return false;
		}
		}

		/**
		* Returns an adjusted {@link Display} object based on the inputs or null if display isn't
		@@ -376,7 +383,7 @@ public class ResourcesManager {
		final Pair<Integer, DisplayAdjustments> key =
		Pair.create(displayId, displayAdjustmentsCopy);
		SoftReference<Display> sd;
		synchronized (this) {
		synchronized (mLock) {
		sd = mAdjustedDisplays.get(key);
		}
		if (sd != null) {
		@@ -392,7 +399,7 @@ public class ResourcesManager {
		}
		final Display display = dm.getCompatibleDisplay(displayId, key.second);
		if (display != null) {
		synchronized (this) {
		synchronized (mLock) {
		mAdjustedDisplays.put(key, new SoftReference<>(display));
		}
		}
		@@ -407,7 +414,7 @@ public class ResourcesManager {
		* @param resources The {@link Resources} backing the display adjustments.
		*/
		public Display getAdjustedDisplay(final int displayId, Resources resources) {
		synchronized (this) {
		synchronized (mLock) {
		final DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();
		if (dm == null) {
		// may be null early in system startup
		@@ -425,7 +432,7 @@ public class ResourcesManager {
		ApkAssets apkAssets;

		// Optimistically check if this ApkAssets exists somewhere else.
		synchronized (this) {
		synchronized (mLock) {
		final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.get(key);
		if (apkAssetsRef != null) {
		apkAssets = apkAssetsRef.get();
		@@ -447,7 +454,7 @@ public class ResourcesManager {
		key.sharedLib ? ApkAssets.PROPERTY_DYNAMIC : 0);
		}

		synchronized (this) {
		synchronized (mLock) {
		mCachedApkAssets.put(key, new WeakReference<>(apkAssets));
		}

		@@ -559,7 +566,7 @@ public class ResourcesManager {
		* @hide
		*/
		public void dump(String prefix, PrintWriter printWriter) {
		synchronized (this) {
		synchronized (mLock) {
		IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, " ");
		for (int i = 0; i < prefix.length() / 2; i++) {
		pw.increaseIndent();
		@@ -688,7 +695,7 @@ public class ResourcesManager {
		*/
		boolean isSameResourcesOverrideConfig(@Nullable IBinder activityToken,
		@Nullable Configuration overrideConfig) {
		synchronized (this) {
		synchronized (mLock) {
		final ActivityResources activityResources
		= activityToken != null ? mActivityResourceReferences.get(activityToken) : null;
		if (activityResources == null) {
		@@ -834,7 +841,7 @@ public class ResourcesManager {
		+ " with key=" + key);
		}

		synchronized (this) {
		synchronized (mLock) {
		// Force the creation of an ActivityResourcesStruct.
		getOrCreateActivityResourcesStructLocked(token);
		}
		@@ -842,7 +849,7 @@ public class ResourcesManager {
		// Update any existing Activity Resources references.
		updateResourcesForActivity(token, overrideConfig, displayId);

		synchronized (this) {
		synchronized (mLock) {
		Resources resources = findResourcesForActivityLocked(token, key,
		classLoader);
		if (resources != null) {
		@@ -868,7 +875,7 @@ public class ResourcesManager {
		*/
		private void rebaseKeyForActivity(IBinder activityToken, ResourcesKey key,
		boolean overridesActivityDisplay) {
		synchronized (this) {
		synchronized (mLock) {
		final ActivityResources activityResources =
		getOrCreateActivityResourcesStructLocked(activityToken);

		@@ -960,7 +967,7 @@ public class ResourcesManager {
		Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
		"ResourcesManager#createApkAssetsSupplierNotLocked");
		try {
		if (DEBUG && Thread.holdsLock(this)) {
		if (DEBUG && Thread.holdsLock(mLock)) {
		Slog.w(TAG, "Calling thread " + Thread.currentThread().getName()
		+ " is holding mLock", new Throwable());
		}
		@@ -994,7 +1001,7 @@ public class ResourcesManager {
		@Nullable
		private Resources createResources(@NonNull ResourcesKey key, @NonNull ClassLoader classLoader,
		@Nullable ApkAssetsSupplier apkSupplier) {
		synchronized (this) {
		synchronized (mLock) {
		if (DEBUG) {
		Throwable here = new Throwable();
		here.fillInStackTrace();
		@@ -1015,7 +1022,7 @@ public class ResourcesManager {
		@NonNull ResourcesKey key, @NonNull Configuration initialOverrideConfig,
		@Nullable Integer overrideDisplayId, @NonNull ClassLoader classLoader,
		@Nullable ApkAssetsSupplier apkSupplier) {
		synchronized (this) {
		synchronized (mLock) {
		if (DEBUG) {
		Throwable here = new Throwable();
		here.fillInStackTrace();
		@@ -1130,7 +1137,7 @@ public class ResourcesManager {
		if (displayId == INVALID_DISPLAY) {
		throw new IllegalArgumentException("displayId can not be INVALID_DISPLAY");
		}
		synchronized (this) {
		synchronized (mLock) {
		final ActivityResources activityResources =
		getOrCreateActivityResourcesStructLocked(activityToken);

		@@ -1269,26 +1276,22 @@ public class ResourcesManager {

		public final boolean applyConfigurationToResources(@NonNull Configuration config,
		@Nullable CompatibilityInfo compat) {
		synchronized(this) {
		return applyConfigurationToResourcesLocked(config, compat, null /* adjustments */);
		}
		}

		public final boolean applyConfigurationToResourcesLocked(@NonNull Configuration config,
		@Nullable CompatibilityInfo compat) {
		return applyConfigurationToResourcesLocked(config, compat, null /* adjustments */);
		return applyConfigurationToResources(config, compat, null /* adjustments */);
		}

		/** Applies the global configuration to the managed resources. */
		public final boolean applyConfigurationToResourcesLocked(@NonNull Configuration config,
		public final boolean applyConfigurationToResources(@NonNull Configuration config,
		@Nullable CompatibilityInfo compat, @Nullable DisplayAdjustments adjustments) {
		synchronized (mLock) {
		try {
		Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
		"ResourcesManager#applyConfigurationToResourcesLocked");
		"ResourcesManager#applyConfigurationToResources");

		if (!mResConfiguration.isOtherSeqNewer(config) && compat == null) {
		if (DEBUG \|\| DEBUG_CONFIGURATION) Slog.v(TAG, "Skipping new config: curSeq="
		if (DEBUG \|\| DEBUG_CONFIGURATION) {
		Slog.v(TAG, "Skipping new config: curSeq="
		+ mResConfiguration.seq + ", newSeq=" + config.seq);
		}
		return false;
		}

		@@ -1296,8 +1299,8 @@ public class ResourcesManager {
		mAdjustedDisplays.clear();

		int changes = mResConfiguration.updateFrom(config);
		if (compat != null && (mResCompatibilityInfo == null \|\|
		!mResCompatibilityInfo.equals(compat))) {
		if (compat != null && (mResCompatibilityInfo == null
		\|\| !mResCompatibilityInfo.equals(compat))) {
		mResCompatibilityInfo = compat;
		changes \|= ActivityInfo.CONFIG_SCREEN_LAYOUT
		\| ActivityInfo.CONFIG_SCREEN_SIZE
		@@ -1306,8 +1309,8 @@ public class ResourcesManager {

		DisplayMetrics displayMetrics = getDisplayMetrics();
		if (adjustments != null) {
		// Currently the only case where the adjustment takes effect is to simulate placing
		// an app in a rotated display.
		// Currently the only case where the adjustment takes effect is to simulate
		// placing an app in a rotated display.
		adjustments.adjustGlobalAppMetrics(displayMetrics);
		}
		Resources.updateSystemConfiguration(config, displayMetrics, compat);
		@@ -1332,6 +1335,7 @@ public class ResourcesManager {
		Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
		}
		}
		}

		private void applyConfigurationToResourcesLocked(@NonNull Configuration config,
		@Nullable CompatibilityInfo compat, Configuration tmpConfig,
		@@ -1378,7 +1382,7 @@ public class ResourcesManager {
		* @param libAssets The library asset paths to add.
		*/
		public void appendLibAssetsForMainAssetPath(String assetPath, String[] libAssets) {
		synchronized (this) {
		synchronized (mLock) {
		// Record which ResourcesImpl need updating
		// (and what ResourcesKey they should update to).
		final ArrayMap<ResourcesImpl, ResourcesKey> updatedResourceKeys = new ArrayMap<>();
		@@ -1414,8 +1418,9 @@ public class ResourcesManager {
		}

		// TODO(adamlesinski): Make this accept more than just overlay directories.
		final void applyNewResourceDirsLocked(@NonNull final ApplicationInfo appInfo,
		void applyNewResourceDirs(@NonNull final ApplicationInfo appInfo,
		@Nullable final String[] oldPaths) {
		synchronized (mLock) {
		try {
		Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
		"ResourcesManager#applyNewResourceDirsLocked");
		@@ -1464,6 +1469,7 @@ public class ResourcesManager {
		Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
		}
		}
		}

		/**
		* Creates an array with the contents of {@param overlayPaths} and the unique elements of
		@@ -1556,7 +1562,7 @@ public class ResourcesManager {
		public boolean overrideTokenDisplayAdjustments(IBinder token,
		@Nullable Consumer<DisplayAdjustments> override) {
		boolean handled = false;
		synchronized (this) {
		synchronized (mLock) {
		final ActivityResources tokenResources = mActivityResourceReferences.get(token);
		if (tokenResources == null) {
		return false;
		@@ -1589,7 +1595,7 @@ public class ResourcesManager {
		@Override
		public void onLoadersChanged(@NonNull Resources resources,
		@NonNull List<ResourcesLoader> newLoader) {
		synchronized (ResourcesManager.this) {
		synchronized (mLock) {
		final ResourcesKey oldKey = findKeyForResourceImplLocked(resources.getImpl());
		if (oldKey == null) {
		throw new IllegalArgumentException("Cannot modify resource loaders of"
		@@ -1617,7 +1623,7 @@ public class ResourcesManager {
		**/
		@Override
		public void onLoaderUpdated(@NonNull ResourcesLoader loader) {
		synchronized (ResourcesManager.this) {
		synchronized (mLock) {
		final ArrayMap<ResourcesImpl, ResourcesKey> updatedResourceImplKeys =
		new ArrayMap<>();

core/tests/coretests/src/android/content/res/ResourcesManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ public class ResourcesManagerTest extends TestCase {

		Configuration newConfig = new Configuration();
		newConfig.orientation = Configuration.ORIENTATION_LANDSCAPE;
		mResourcesManager.applyConfigurationToResourcesLocked(newConfig, null);
		mResourcesManager.applyConfigurationToResources(newConfig, null);

		final Configuration expectedConfig = new Configuration();
		expectedConfig.setToDefaults();