diff options
| author | Craig Mautner <cmautner@google.com> | 2014-11-21 22:45:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-21 22:45:08 +0000 |
| commit | 0a398d7bb477c57508e5a7374e91cb331b689290 (patch) | |
| tree | afdb210f882b249337bd1f829e8a6c88a1bcc6db /services | |
| parent | cb721bf674e3b36a7c16fcc8f61646404d348bd3 (diff) | |
| parent | f49b0a45aece9bad42d81a09eeceaf1b5b6c06df (diff) | |
| download | frameworks_base-0a398d7bb477c57508e5a7374e91cb331b689290.zip frameworks_base-0a398d7bb477c57508e5a7374e91cb331b689290.tar.gz frameworks_base-0a398d7bb477c57508e5a7374e91cb331b689290.tar.bz2 | |
Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 5a948f9..ea694ad 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -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); + } } /** |