Merge changes from topic "revert-15058002-SNQUARIDWJ" into sc-dev am: 8d440c0566 (b268728b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+237 −296

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ContextImpl.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.ApplicationInfoFlags;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.AssetManager;
		import android.content.res.CompatResources;
		@@ -2461,7 +2462,7 @@ class ContextImpl extends Context {
		public Context createApplicationContext(ApplicationInfo application, int flags)
		throws NameNotFoundException {
		LoadedApk pi = mMainThread.getPackageInfo(application, mResources.getCompatibilityInfo(),
		flags \| CONTEXT_REGISTER_PACKAGE, false);
		flags \| CONTEXT_REGISTER_PACKAGE);
		if (pi != null) {
		ContextImpl c = new ContextImpl(this, mMainThread, pi, ContextParams.EMPTY,
		mAttributionSource.getAttributionTag(),
		@@ -2493,6 +2494,13 @@ class ContextImpl extends Context {
		@Override
		public Context createPackageContextAsUser(String packageName, int flags, UserHandle user)
		throws NameNotFoundException {
		return createPackageContextAsUser(packageName, flags, user, 0 /* packageFlags */);
		}

		@Override
		public Context createPackageContextAsUser(
		@NonNull String packageName, @CreatePackageOptions int flags, @NonNull UserHandle user,
		@ApplicationInfoFlags int packageFlags) throws PackageManager.NameNotFoundException {
		if (packageName.equals("system") \|\| packageName.equals("android")) {
		// The system resources are loaded in every application, so we can safely copy
		// the context without reloading Resources.
		@@ -2503,7 +2511,7 @@ class ContextImpl extends Context {
		}

		LoadedApk pi = mMainThread.getPackageInfo(packageName, mResources.getCompatibilityInfo(),
		flags \| CONTEXT_REGISTER_PACKAGE, user.getIdentifier());
		flags \| CONTEXT_REGISTER_PACKAGE, user.getIdentifier(), packageFlags);
		if (pi != null) {
		ContextImpl c = new ContextImpl(this, mMainThread, pi, mParams,
		mAttributionSource.getAttributionTag(),

core/java/android/app/Notification.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -6344,10 +6344,11 @@ public class Notification implements Parcelable
		ApplicationInfo applicationInfo = n.extras.getParcelable(
		EXTRA_BUILDER_APPLICATION_INFO);
		Context builderContext;
		if (applicationInfo != null) {
		if (applicationInfo != null && applicationInfo.packageName != null) {
		try {
		builderContext = context.createApplicationContext(applicationInfo,
		Context.CONTEXT_RESTRICTED);
		builderContext = context.createPackageContextAsUser(applicationInfo.packageName,
		Context.CONTEXT_RESTRICTED,
		UserHandle.getUserHandleForUid(applicationInfo.uid));
		} catch (NameNotFoundException e) {
		Log.e(TAG, "ApplicationInfo " + applicationInfo + " not found");
		builderContext = context; // try with our context

core/java/android/app/ResourcesManager.java

+5 −38

Original line number	Diff line number	Diff line
		@@ -97,12 +97,6 @@ public class ResourcesManager {
		*/
		private int mResDisplayId = DEFAULT_DISPLAY;

		/**
		* ApplicationInfo changes that need to be applied to Resources when the next configuration
		* change occurs.
		*/
		private ArrayList<ApplicationInfo> mPendingAppInfoUpdates;

		/**
		* A mapping of ResourceImpls and their configurations. These are heavy weight objects
		* which should be reused as much as possible.
		@@ -994,7 +988,7 @@ public class ResourcesManager {
		* @param classLoader The classloader to use for the Resources object.
		* If null, {@link ClassLoader#getSystemClassLoader()} is used.
		* @return A Resources object that gets updated when
		* {@link #applyConfigurationToResources(Configuration, CompatibilityInfo)}
		* {@link #applyConfigurationToResourcesLocked(Configuration, CompatibilityInfo)}
		* is called.
		*/
		@Nullable
		@@ -1121,8 +1115,8 @@ public class ResourcesManager {
		/**
		* Updates an Activity's Resources object with overrideConfig. The Resources object
		* that was previously returned by {@link #getResources(IBinder, String, String[], String[],
		* String[], String[], Integer, Configuration, CompatibilityInfo, ClassLoader, List)} is still
		* valid and will have the updated configuration.
		* String[], Integer, Configuration, CompatibilityInfo, ClassLoader, List)} is still valid and
		* will have the updated configuration.
		*
		* @param activityToken The Activity token.
		* @param overrideConfig The configuration override to update.
		@@ -1273,22 +1267,6 @@ public class ResourcesManager {
		return newKey;
		}

		public void updatePendingAppInfoUpdates(@NonNull ApplicationInfo appInfo) {
		synchronized (mLock) {
		if (mPendingAppInfoUpdates == null) {
		mPendingAppInfoUpdates = new ArrayList<>();
		}
		// Clear previous app info changes for the package to prevent multiple ResourcesImpl
		// recreations when only the last recreation will be used.
		for (int i = mPendingAppInfoUpdates.size() - 1; i >= 0; i--) {
		if (appInfo.sourceDir.equals(mPendingAppInfoUpdates.get(i).sourceDir)) {
		mPendingAppInfoUpdates.remove(i);
		}
		}
		mPendingAppInfoUpdates.add(appInfo);
		}
		}

		public final boolean applyConfigurationToResources(@NonNull Configuration config,
		@Nullable CompatibilityInfo compat) {
		return applyConfigurationToResources(config, compat, null /* adjustments */);
		@@ -1302,18 +1280,7 @@ public class ResourcesManager {
		Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
		"ResourcesManager#applyConfigurationToResources");

		final boolean assetsUpdated = mPendingAppInfoUpdates != null
		&& config.assetsSeq > mResConfiguration.assetsSeq;
		if (assetsUpdated) {
		for (int i = 0, n = mPendingAppInfoUpdates.size(); i < n; i++) {
		final ApplicationInfo appInfo = mPendingAppInfoUpdates.get(i);
		applyNewResourceDirs(appInfo, new String[]{appInfo.sourceDir});
		}
		mPendingAppInfoUpdates = null;
		}

		if (!assetsUpdated && !mResConfiguration.isOtherSeqNewer(config)
		&& compat == null) {
		if (!mResConfiguration.isOtherSeqNewer(config) && compat == null) {
		if (DEBUG \|\| DEBUG_CONFIGURATION) {
		Slog.v(TAG, "Skipping new config: curSeq="
		+ mResConfiguration.seq + ", newSeq=" + config.seq);
		@@ -1353,7 +1320,7 @@ public class ResourcesManager {
		}
		}

		return assetsUpdated \|\| changes != 0;
		return changes != 0;
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
		}

core/java/android/appwidget/AppWidgetHostView.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.os.Build;
		import android.os.Bundle;
		import android.os.CancellationSignal;
		import android.os.Parcelable;
		import android.os.UserHandle;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.Pair;
		@@ -718,9 +719,10 @@ public class AppWidgetHostView extends FrameLayout {
		protected Context getRemoteContext() {
		try {
		// Return if cloned successfully, otherwise default
		Context newContext = mContext.createApplicationContext(
		mInfo.providerInfo.applicationInfo,
		Context.CONTEXT_RESTRICTED);
		final ApplicationInfo info = mInfo.providerInfo.applicationInfo;
		Context newContext = mContext.createPackageContextAsUser(info.packageName,
		Context.CONTEXT_RESTRICTED,
		UserHandle.getUserHandleForUid(info.uid));
		if (mColorResources != null) {
		mColorResources.apply(newContext);
		}