Merge "Cache per-Activity Resources objects" into nyc-dev (58f1018c) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+88 −67

Original line number	Diff line number	Diff line
		@@ -1793,24 +1793,9 @@ public final class ActivityThread {
		* Resources if one has already been created.
		*/
		Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] overlayDirs,
		String[] libDirs, int displayId, Configuration overrideConfiguration,
		LoadedApk pkgInfo) {
		return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,
		displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo(),
		pkgInfo.getClassLoader());
		}

		/**
		* Creates a new top level resources for the given package. Will always create a new
		* Resources, regardless if one has already been created.
		*/
		Resources getNewTopLevelResources(String resDir, String[] splitResDirs, String[] overlayDirs,
		String[] libDirs, int displayId, Configuration overrideConfiguration,
		LoadedApk pkgInfo) {
		mResourcesManager.removeTopLevelResources(
		resDir, displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo());
		return getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,
		displayId, overrideConfiguration, pkgInfo);
		String[] libDirs, int displayId, LoadedApk pkgInfo) {
		return mResourcesManager.getResources(null, resDir, splitResDirs, overlayDirs, libDirs,
		displayId, null, pkgInfo.getCompatibilityInfo(), pkgInfo.getClassLoader());
		}

		final Handler getHandler() {
		@@ -2624,7 +2609,7 @@ public final class ActivityThread {
		}

		ContextImpl appContext = ContextImpl.createActivityContext(
		this, r.packageInfo, displayId, r.overrideConfig);
		this, r.packageInfo, r.token, displayId, r.overrideConfig);
		appContext.setOuterContext(activity);
		Context baseContext = appContext;

		@@ -3481,14 +3466,9 @@ public final class ActivityThread {
		if (!r.activity.mFinished && willBeVisible
		&& r.activity.mDecor != null && !r.hideForNow) {
		if (r.newConfig != null) {
		r.tmpConfig.setTo(r.newConfig);
		if (r.overrideConfig != null) {
		r.tmpConfig.updateFrom(r.overrideConfig);
		}
		performConfigurationChangedForActivity(r, r.newConfig, REPORT_TO_ACTIVITY);
		if (DEBUG_CONFIGURATION) Slog.v(TAG, "Resuming activity "
		+ r.activityInfo.name + " with newConfig " + r.tmpConfig);
		performConfigurationChanged(r.activity, r.tmpConfig, REPORT_TO_ACTIVITY);
		freeTextLayoutCachesIfNeeded(r.activity.mCurrentConfig.diff(r.tmpConfig));
		+ r.activityInfo.name + " with newConfig " + r.activity.mCurrentConfig);
		r.newConfig = null;
		}
		if (localLOGV) Slog.v(TAG, "Resuming " + r + " with isForward="
		@@ -3833,14 +3813,10 @@ public final class ActivityThread {
		}
		}
		if (r.newConfig != null) {
		r.tmpConfig.setTo(r.newConfig);
		if (r.overrideConfig != null) {
		r.tmpConfig.updateFrom(r.overrideConfig);
		}
		performConfigurationChangedForActivity(r, r.newConfig, REPORT_TO_ACTIVITY);
		if (DEBUG_CONFIGURATION) Slog.v(TAG, "Updating activity vis "
		+ r.activityInfo.name + " with new config " + r.tmpConfig);
		performConfigurationChanged(r.activity, r.tmpConfig, REPORT_TO_ACTIVITY);
		freeTextLayoutCachesIfNeeded(r.activity.mCurrentConfig.diff(r.tmpConfig));
		+ r.activityInfo.name + " with new config "
		+ r.activity.mCurrentConfig);
		r.newConfig = null;
		}
		} else {
		@@ -4545,7 +4521,43 @@ public final class ActivityThread {
		return callbacks;
		}

		private static void performConfigurationChanged(ComponentCallbacks2 cb, Configuration config,
		/**
		* Updates the configuration for an Activity. The ActivityClientRecord's
		* {@link ActivityClientRecord#overrideConfig} is used to compute the final Configuration for
		* that Activity. {@link ActivityClientRecord#tmpConfig} is used as a temporary for delivering
		* the updated Configuration.
		* @param r ActivityClientRecord representing the Activity.
		* @param newBaseConfig The new configuration to use. This may be augmented with
		* {@link ActivityClientRecord#overrideConfig}.
		* @param reportToActivity true if the change should be reported to the Activity's callback.
		*/
		private void performConfigurationChangedForActivity(ActivityClientRecord r,
		Configuration newBaseConfig,
		boolean reportToActivity) {
		r.tmpConfig.setTo(newBaseConfig);
		if (r.overrideConfig != null) {
		r.tmpConfig.updateFrom(r.overrideConfig);
		}
		performConfigurationChanged(r.activity, r.token, r.tmpConfig, r.overrideConfig,
		reportToActivity);
		freeTextLayoutCachesIfNeeded(r.activity.mCurrentConfig.diff(r.tmpConfig));
		}

		/**
		* Decides whether to update an Activity's configuration and whether to tell the
		* Activity/Component about it.
		* @param cb The component callback to notify of configuration change.
		* @param activityToken The Activity binder token for which this configuration change happened.
		* If the change is global, this is null.
		* @param newConfig The new configuration.
		* @param overrideConfig The override config that differentiates the Activity's configuration
		* from the base global configuration.
		* @param reportToActivity Notify the Activity of the change.
		*/
		private void performConfigurationChanged(ComponentCallbacks2 cb,
		IBinder activityToken,
		Configuration newConfig,
		Configuration overrideConfig,
		boolean reportToActivity) {
		// Only for Activity objects, check that they actually call up to their
		// superclass implementation. ComponentCallbacks2 is an interface, so
		@@ -4563,7 +4575,7 @@ public final class ActivityThread {
		// If the new config is the same as the config this Activity
		// is already running with then don't bother calling
		// onConfigurationChanged
		int diff = activity.mCurrentConfig.diff(config);
		int diff = activity.mCurrentConfig.diff(newConfig);
		if (diff != 0) {
		// If this activity doesn't handle any of the config changes then don't bother
		// calling onConfigurationChanged as we're going to destroy it.
		@@ -4578,11 +4590,21 @@ public final class ActivityThread {
		}
		}

		if (DEBUG_CONFIGURATION) Slog.v(TAG, "Config callback " + cb
		+ ": shouldChangeConfig=" + shouldChangeConfig);
		if (DEBUG_CONFIGURATION) {
		Slog.v(TAG, "Config callback " + cb + ": shouldChangeConfig=" + shouldChangeConfig);
		}

		if (shouldChangeConfig) {
		if (activityToken != null) {
		// We only update an Activity's configuration if this is not a global
		// configuration change. This must also be done before the callback,
		// or else we violate the contract that the new resources are available
		// in {@link ComponentCallbacks2#onConfigurationChanged(Configuration)}.
		mResourcesManager.updateResourcesForActivity(activityToken, overrideConfig);
		}

		if (reportToActivity) {
		cb.onConfigurationChanged(config);
		cb.onConfigurationChanged(newConfig);
		}

		if (activity != null) {
		@@ -4592,7 +4614,7 @@ public final class ActivityThread {
		" did not call through to super.onConfigurationChanged()");
		}
		activity.mConfigChangeFlags = 0;
		activity.mCurrentConfig = new Configuration(config);
		activity.mCurrentConfig = new Configuration(newConfig);
		}
		}
		}
		@@ -4609,7 +4631,8 @@ public final class ActivityThread {
		mCompatConfiguration = new Configuration();
		}
		mCompatConfiguration.setTo(mConfiguration);
		if (mResourcesManager.applyCompatConfiguration(displayDensity, mCompatConfiguration)) {
		if (mResourcesManager.applyCompatConfigurationLocked(displayDensity,
		mCompatConfiguration)) {
		config = mCompatConfiguration;
		}
		return config;
		@@ -4661,7 +4684,8 @@ public final class ActivityThread {
		if (callbacks != null) {
		final int N = callbacks.size();
		for (int i=0; i<N; i++) {
		performConfigurationChanged(callbacks.get(i), config, REPORT_TO_ACTIVITY);
		performConfigurationChanged(callbacks.get(i), null, config, null,
		REPORT_TO_ACTIVITY);
		}
		}
		}
		@@ -4687,15 +4711,8 @@ public final class ActivityThread {
		if (DEBUG_CONFIGURATION) Slog.v(TAG, "Handle activity config changed: "
		+ r.activityInfo.name + ", with callback=" + reportToActivity);

		r.tmpConfig.setTo(mCompatConfiguration);
		if (data.overrideConfig != null) {
		r.overrideConfig = data.overrideConfig;
		r.tmpConfig.updateFrom(data.overrideConfig);
		}
		performConfigurationChanged(r.activity, r.tmpConfig, reportToActivity);

		freeTextLayoutCachesIfNeeded(r.activity.mCurrentConfig.diff(mCompatConfiguration));

		performConfigurationChangedForActivity(r, mCompatConfiguration, reportToActivity);
		mSomeActivitiesChanged = true;
		}

		@@ -5032,6 +5049,7 @@ public final class ActivityThread {
		*/
		TimeZone.setDefault(null);

		synchronized (mResourcesManager) {
		/*
		* Initialize the default locales in this process for the reasons we set the time zone.
		*
		@@ -5046,7 +5064,10 @@ public final class ActivityThread {
		*/
		mResourcesManager.applyConfigurationToResourcesLocked(data.config, data.compatInfo);
		mCurDefaultDisplayDpi = data.config.densityDpi;

		// This calls mResourcesManager so keep it within the synchronized block.
		applyCompatConfiguration(mCurDefaultDisplayDpi);
		}

		data.info = getPackageInfoNoCheck(data.appInfo, data.compatInfo);

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1182,7 +1182,7 @@ public class ApplicationPackageManager extends PackageManager {
		sameUid ? app.sourceDir : app.publicSourceDir,
		sameUid ? app.splitSourceDirs : app.splitPublicSourceDirs,
		app.resourceDirs, app.sharedLibraryFiles, Display.DEFAULT_DISPLAY,
		null, mContext.mPackageInfo);
		mContext.mPackageInfo);
		if (r != null) {
		return r;
		}

core/java/android/app/ContextImpl.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -1994,9 +1994,10 @@ class ContextImpl extends Context {
		}

		static ContextImpl createActivityContext(ActivityThread mainThread,
		LoadedApk packageInfo, int displayId, Configuration overrideConfiguration) {
		LoadedApk packageInfo, IBinder activityToken, int displayId,
		Configuration overrideConfiguration) {
		if (packageInfo == null) throw new IllegalArgumentException("packageInfo");
		return new ContextImpl(null, mainThread, packageInfo, null, null, 0,
		return new ContextImpl(null, mainThread, packageInfo, activityToken, null, 0,
		null, overrideConfiguration, displayId);
		}

		@@ -2054,10 +2055,16 @@ class ContextImpl extends Context {
		\|\| overrideConfiguration != null
		\|\| (compatInfo != null && compatInfo.applicationScale
		!= resources.getCompatibilityInfo().applicationScale)) {
		resources = mResourcesManager.getTopLevelResources(packageInfo.getResDir(),
		packageInfo.getSplitResDirs(), packageInfo.getOverlayDirs(),
		packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,
		overrideConfiguration, compatInfo, packageInfo.getClassLoader());
		resources = mResourcesManager.getResources(
		activityToken,
		packageInfo.getResDir(),
		packageInfo.getSplitResDirs(),
		packageInfo.getOverlayDirs(),
		packageInfo.getApplicationInfo().sharedLibraryFiles,
		displayId,
		overrideConfiguration,
		compatInfo,
		packageInfo.getClassLoader());
		}
		}
		mResources = resources;

core/java/android/app/LoadedApk.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -283,9 +283,9 @@ public final class LoadedApk {
		synchronized (this) {
		mClassLoader = createOrUpdateClassLoaderLocked(addedPaths);
		if (mResources != null) {
		mResources = mActivityThread.getNewTopLevelResources(mResDir, mSplitResDirs,
		mResources = mActivityThread.getTopLevelResources(mResDir, mSplitResDirs,
		mOverlayDirs, mApplicationInfo.sharedLibraryFiles, Display.DEFAULT_DISPLAY,
		null /overrideConfiguration/, this);
		this);
		}
		}
		}
		@@ -668,7 +668,7 @@ public final class LoadedApk {
		public Resources getResources(ActivityThread mainThread) {
		if (mResources == null) {
		mResources = mainThread.getTopLevelResources(mResDir, mSplitResDirs, mOverlayDirs,
		mApplicationInfo.sharedLibraryFiles, Display.DEFAULT_DISPLAY, null, this);
		mApplicationInfo.sharedLibraryFiles, Display.DEFAULT_DISPLAY, this);
		}
		return mResources;
		}

core/java/android/app/ResourcesManager.java

+360 −116

File changed.

Preview size limit exceeded, changes collapsed.