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

Commit 0a398d7b authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev

parents cb721bf6 f49b0a45

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);

        }

    }



    /**