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

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

Browse Source 
* commit '0a398d7bb477c57508e5a7374e91cb331b689290':
  Treat screen-on while pausing as pause timeout.
This commit is contained in:
Craig Mautner
2014-11-21 23:01:01 +00:00
committed by Android Git Automerger
parent 21bc2e3e1e 0a398d7bb4
commit a673263d05
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);
}
} }
/** /**