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

Commit 7ec34f2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update application info for activity record when application info... 

Merge "Update application info for activity record when application info changed" into main am: ac3be0cd am: 3b515835

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



Change-Id: Ia12270426e1d590701a60bda23b353cb2801c07d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7da28449 3b515835

services/core/java/com/android/server/am/ProcessList.java

+1 −0
Original line number Diff line number Diff line
@@ -5187,6 +5187,7 @@ public final class ProcessList { 
                        if (ai != null) {

                            if (ai.packageName.equals(app.info.packageName)) {

                                app.info = ai;

                                app.getWindowProcessController().updateApplicationInfo(ai);

                                PlatformCompatCache.getInstance()

                                        .onApplicationInfoChanged(ai);

                            }

services/core/java/com/android/server/wm/WindowProcessController.java

+6 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
    private int mRapidActivityLaunchCount;



    // all about the first app in the process

    final ApplicationInfo mInfo;

    volatile ApplicationInfo mInfo;

    final String mName;

    final int mUid;
@@ -1805,12 +1805,17 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
            Configuration overrideConfig = new Configuration(r.getRequestedOverrideConfiguration());

            overrideConfig.assetsSeq = assetSeq;

            r.onRequestedOverrideConfigurationChanged(overrideConfig);

            r.updateApplicationInfo(mInfo);

            if (r.isVisibleRequested()) {

                r.ensureActivityConfiguration();

            }

        }

    }



    public void updateApplicationInfo(ApplicationInfo aInfo) {

        mInfo = aInfo;

    }



    /**

     * This is called for sending {@link android.app.servertransaction.LaunchActivityItem}.

     * The caller must call {@link #setLastReportedConfiguration} if the delivered configuration