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

Commit 3b515835 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

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



Change-Id: I7913c29fb0592598af64e3ba26d3e8ed9eea45c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16844470 ac3be0cd

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

+1 −0
Original line number Diff line number Diff line
@@ -5146,6 +5146,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
@@ -122,7 +122,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;
@@ -1789,12 +1789,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