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

Commit c8d97850 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am a673263d: am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 

* commit 'a673263d':
  Treat screen-on while pausing as pause timeout.
parents bb97b311 a673263d

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

+4 −0
Original line number Diff line number Diff line
@@ -700,6 +700,10 @@ final class ActivityStack { 
                activities.get(activityNdx).setSleeping(false);

            }

        }

        if (mPausingActivity != null) {

            Slog.d(TAG, "awakeFromSleepingLocked: previously pausing activity didn't pause");

            activityPausedLocked(mPausingActivity.appToken, true);

        }

    }



    /**