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

Commit 4de4528d authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Log activity relaunch" into sc-dev am: 878589db 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib94fa05f181230d1914262416859d4675b3a7bc0
parents cb9678f7 878589db

core/java/android/app/ActivityThread.java

+5 −3
Original line number Diff line number Diff line
@@ -5141,7 +5141,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private void onCoreSettingsChange() {

        if (updateDebugViewAttributeState()) {

            // request all activities to relaunch for the changes to take place

            relaunchAllActivities(false /* preserveWindows */);

            relaunchAllActivities(false /* preserveWindows */, "onCoreSettingsChange");

        }

    }
@@ -5160,7 +5160,8 @@ public final class ActivityThread extends ClientTransactionHandler { 
        return previousState != View.sDebugViewAttributes;

    }



    private void relaunchAllActivities(boolean preserveWindows) {

    private void relaunchAllActivities(boolean preserveWindows, String reason) {

        Log.i(TAG, "Relaunch all activities: " + reason);

        for (int i = mActivities.size() - 1; i >= 0; i--) {

            scheduleRelaunchActivityIfPossible(mActivities.valueAt(i), preserveWindows);

        }
@@ -5535,6 +5536,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    void scheduleRelaunchActivity(IBinder token) {

        final ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            Log.i(TAG, "Schedule relaunch activity: " + r.activityInfo.name);

            scheduleRelaunchActivityIfPossible(r, !r.stopped /* preserveWindow */);

        }

    }
@@ -6079,7 +6081,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        handleConfigurationChanged(newConfig, null);



        // Preserve windows to avoid black flickers when overlays change.

        relaunchAllActivities(true /* preserveWindows */);

        relaunchAllActivities(true /* preserveWindows */, "handleApplicationInfoChanged");

    }



    static void freeTextLayoutCachesIfNeeded(int configDiff) {