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

* commit '0a398d7bb477c57508e5a7374e91cb331b689290': Treat screen-on while pausing as pause timeout.
2014-11-21 23:01:01 +00:00
parent 21bc2e3e1e 0a398d7bb4
commit a673263d05
1 changed files with 4 additions and 0 deletions
--- 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);
+        }
    }

    /**