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

Commit a552f9de authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\"... 

Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b746
am: 6d296286

Change-Id: I338f8d2cf0124a36b61d01dfa79dee91128506ac
parents 851e5a7e 6d296286

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

+10 −1
Original line number Diff line number Diff line
@@ -4448,7 +4448,7 @@ final class ActivityStack { 
            }

        }

        if (updatedConfig) {

            // Ensure the resumed state of the focus activity if we updated the confiugaration of

            // Ensure the resumed state of the focus activity if we updated the configuration of

            // any activity.

            mStackSupervisor.resumeFocusedStackTopActivityLocked();

        }
@@ -4468,6 +4468,15 @@ final class ActivityStack { 
            return true;

        }



        // TODO: We could probably make the condition below just check that the activity state is

        // stopped, but also checking the sleep state for now to reduce change impact late in

        // development cycle.

        if (mService.isSleepingOrShuttingDownLocked() && r.state == ActivityState.STOPPED) {

            if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

                    "Skipping config check (stopped while sleeping): " + r);

            return true;

        }



        if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,

                "Ensuring correct configuration: " + r);