Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-11-21 22:45:07 +00:00
committed by Android (Google) Code Review
parent cb721bf674 f49b0a45ae
commit 0a398d7bb4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -700,6 +700,10 @@ final class ActivityStack {
activities.get(activityNdx).setSleeping(false); activities.get(activityNdx).setSleeping(false);
} }
} }
if (mPausingActivity != null) {
Slog.d(TAG, "awakeFromSleepingLocked: previously pausing activity didn't pause");
activityPausedLocked(mPausingActivity.appToken, true);
}
} }
/** /**