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

Commit fa80ffa4 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity... 

am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev

* commit '638918a2':
  Fix a regression in pausing activity immediately on sleep
parents 84fa15ce 638918a2

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

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

            }

        }

        checkReadyForSleepLocked();

    }



    boolean shutdownLocked(int timeout) {

        boolean timedout = false;

        goingToSleepLocked();

        checkReadyForSleepLocked();



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

        while (true) {