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

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

Moved activity to stopped state if relaunched while device is asleep

am: 3e99736b

Change-Id: I38552093c320d5c4ff74e615ae8b9959f306cd82
parents 0ba73b98 3e99736b
Loading
Loading
Loading
Loading
+6 −2
Original line number Original line Diff line number Diff line
@@ -1309,8 +1309,12 @@ final class ActivityRecord {
                state == ActivityState.RESUMED;
                state == ActivityState.RESUMED;
    }
    }


    public void setSleeping(boolean _sleeping) {
    void setSleeping(boolean _sleeping) {
        if (sleeping == _sleeping) {
        setSleeping(_sleeping, false);
    }

    void setSleeping(boolean _sleeping, boolean force) {
        if (!force && sleeping == _sleeping) {
            return;
            return;
        }
        }
        if (app != null && app.thread != null) {
        if (app != null && app.thread != null) {
+0 −9
Original line number Original line Diff line number Diff line
@@ -4512,15 +4512,6 @@ final class ActivityStack {
            return true;
            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,
        if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
                "Ensuring correct configuration: " + r);
                "Ensuring correct configuration: " + r);


+6 −0
Original line number Original line Diff line number Diff line
@@ -3708,6 +3708,12 @@ public final class ActivityStackSupervisor implements DisplayListener {


    void activityRelaunchedLocked(IBinder token) {
    void activityRelaunchedLocked(IBinder token) {
        mWindowManager.notifyAppRelaunchingFinished(token);
        mWindowManager.notifyAppRelaunchingFinished(token);
        if (mService.isSleepingOrShuttingDownLocked()) {
            final ActivityRecord r = ActivityRecord.isInStackLocked(token);
            if (r != null) {
                r.setSleeping(true, true);
            }
        }
    }
    }


    void activityRelaunchingLocked(ActivityRecord r) {
    void activityRelaunchingLocked(ActivityRecord r) {