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

Commit 722b15e0 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev

parents a84ca8a3 ce15e157

services/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2105,12 +2105,12 @@ public final class ActivityStackSupervisor { 
                mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);

                mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);

            }

            }

        }

        }

        checkReadyForSleepLocked();

    }

    }





    boolean shutdownLocked(int timeout) {

    boolean shutdownLocked(int timeout) {

        boolean timedout = false;

        boolean timedout = false;

        goingToSleepLocked();

        goingToSleepLocked();

        checkReadyForSleepLocked();





        final long endTime = System.currentTimeMillis() + timeout;

        final long endTime = System.currentTimeMillis() + timeout;

        while (true) {

        while (true) {