Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30d3f5c8 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-15058002-SNQUARIDWJ" into sc-dev am: b3659d36 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156470

Change-Id: Id42ab1afe6e614927066dc8805f69c0a53afaae8
parents c528cc40 b3659d36

core/java/android/app/ActivityThread.java

+5 −13
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.assist.AssistContent;

import android.app.assist.AssistStructure;

import android.app.backup.BackupAgent;
@@ -62,7 +61,6 @@ import android.content.ContentCaptureOptions; 
import android.content.ContentProvider;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context.CreatePackageOptions;

import android.content.IContentProvider;

import android.content.IIntentReceiver;

import android.content.Intent;
@@ -73,7 +71,6 @@ import android.content.pm.IPackageManager; 
import android.content.pm.InstrumentationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.ApplicationInfoFlags;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionInfo;
@@ -1172,6 +1169,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        }



        public void scheduleApplicationInfoChanged(ApplicationInfo ai) {

            mResourcesManager.updatePendingAppInfoUpdates(ai);

            mH.removeMessages(H.APPLICATION_INFO_CHANGED, ai);

            sendMessage(H.APPLICATION_INFO_CHANGED, ai);

        }
@@ -2376,22 +2374,16 @@ public final class ActivityThread extends ClientTransactionHandler 


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

            @CreatePackageOptions int flags) {

            int flags) {

        return getPackageInfo(packageName, compatInfo, flags, UserHandle.myUserId());

    }



    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

            @CreatePackageOptions int flags, @UserIdInt int userId) {

        return getPackageInfo(packageName, compatInfo, flags, userId, 0 /* packageFlags */);

    }



    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

            @CreatePackageOptions int flags, @UserIdInt int userId,

            @ApplicationInfoFlags int packageFlags) {

            int flags, int userId) {

        final boolean differentUser = (UserHandle.myUserId() != userId);

        ApplicationInfo ai = PackageManager.getApplicationInfoAsUserCached(

                packageName,

                packageFlags | PackageManager.GET_SHARED_LIBRARY_FILES

                PackageManager.GET_SHARED_LIBRARY_FILES

                | PackageManager.MATCH_DEBUG_TRIAGED_MISSING,

                (userId < 0) ? UserHandle.myUserId() : userId);

        synchronized (mResourcesManager) {
@@ -2434,7 +2426,7 @@ public final class ActivityThread extends ClientTransactionHandler 


    @UnsupportedAppUsage(trackingBug = 171933273)

    public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo,

            @CreatePackageOptions int flags) {

            int flags) {

        boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0;

        boolean securityViolation = includeCode && ai.uid != 0

                && ai.uid != Process.SYSTEM_UID && (mBoundApplication != null

core/java/android/app/ContextImpl.java

+2 −10
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UiContext;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.AttributionSource;

import android.content.AutofillOptions;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -48,7 +47,6 @@ 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;
@@ -62,6 +60,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; 
import android.graphics.Bitmap;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.content.AttributionSource;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;
@@ -2494,13 +2493,6 @@ 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.
@@ -2511,7 +2503,7 @@ class ContextImpl extends Context { 
        }



        LoadedApk pi = mMainThread.getPackageInfo(packageName, mResources.getCompatibilityInfo(),

                flags | CONTEXT_REGISTER_PACKAGE, user.getIdentifier(), packageFlags);

                flags | CONTEXT_REGISTER_PACKAGE, user.getIdentifier());

        if (pi != null) {

            ContextImpl c = new ContextImpl(this, mMainThread, pi, mParams,

                    mAttributionSource.getAttributionTag(),

core/java/android/app/Notification.java

+3 −4
Original line number Diff line number Diff line
@@ -6344,11 +6344,10 @@ public class Notification implements Parcelable 
            ApplicationInfo applicationInfo = n.extras.getParcelable(

                    EXTRA_BUILDER_APPLICATION_INFO);

            Context builderContext;

            if (applicationInfo != null && applicationInfo.packageName != null) {

            if (applicationInfo != null) {

                try {

                    builderContext = context.createPackageContextAsUser(applicationInfo.packageName,

                            Context.CONTEXT_RESTRICTED,

                            UserHandle.getUserHandleForUid(applicationInfo.uid));

                    builderContext = context.createApplicationContext(applicationInfo,

                            Context.CONTEXT_RESTRICTED);

                } catch (NameNotFoundException e) {

                    Log.e(TAG, "ApplicationInfo " + applicationInfo + " not found");

                    builderContext = context;  // try with our context

core/java/android/app/ResourcesManager.java

+38 −5
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ 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.
@@ -988,7 +994,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 #applyConfigurationToResourcesLocked(Configuration, CompatibilityInfo)}

     *         {@link #applyConfigurationToResources(Configuration, CompatibilityInfo)}

     *         is called.

     */

    @Nullable
@@ -1115,8 +1121,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[], Integer, Configuration, CompatibilityInfo, ClassLoader, List)} is still valid and

     * will have the updated configuration.

     * String[], 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.
@@ -1267,6 +1273,22 @@ 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 */);
@@ -1280,7 +1302,18 @@ public class ResourcesManager { 
                Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,

                        "ResourcesManager#applyConfigurationToResources");



                if (!mResConfiguration.isOtherSeqNewer(config) && compat == null) {

                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 (DEBUG || DEBUG_CONFIGURATION) {

                        Slog.v(TAG, "Skipping new config: curSeq="

                                + mResConfiguration.seq + ", newSeq=" + config.seq);
@@ -1320,7 +1353,7 @@ public class ResourcesManager { 
                    }

                }



                return changes != 0;

                return assetsUpdated || changes != 0;

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);

            }

core/java/android/appwidget/AppWidgetHostView.java

+3 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 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;
@@ -719,10 +718,9 @@ public class AppWidgetHostView extends FrameLayout { 
    protected Context getRemoteContext() {

        try {

            // Return if cloned successfully, otherwise default

            final ApplicationInfo info = mInfo.providerInfo.applicationInfo;

            Context newContext = mContext.createPackageContextAsUser(info.packageName,

                    Context.CONTEXT_RESTRICTED,

                    UserHandle.getUserHandleForUid(info.uid));

            Context newContext = mContext.createApplicationContext(

                    mInfo.providerInfo.applicationInfo,

                    Context.CONTEXT_RESTRICTED);

            if (mColorResources != null) {

                mColorResources.apply(newContext);

            }