Tell PhoneWindowManager when we start/finish interactive changes.
Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.
Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP. We are now track
the early / late interactive change work separately from the rest.
Bug: 21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index a4e9c68..5ef7c1e 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1451,7 +1451,8 @@
// Match current screen state.
if (!mPowerManager.isInteractive()) {
- goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
+ startedGoingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
+ finishedGoingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
}
mWindowManagerInternal.registerAppTransitionListener(
@@ -5215,9 +5216,15 @@
// Called on the PowerManager's Notifier thread.
@Override
- public void goingToSleep(int why) {
+ public void startedGoingToSleep(int why) {
+ if (DEBUG_WAKEUP) Slog.i(TAG, "Started going to sleep... (why=" + why + ")");
+ }
+
+ // Called on the PowerManager's Notifier thread.
+ @Override
+ public void finishedGoingToSleep(int why) {
EventLog.writeEvent(70000, 0);
- if (DEBUG_WAKEUP) Slog.i(TAG, "Going to sleep...");
+ if (DEBUG_WAKEUP) Slog.i(TAG, "Finished going to sleep... (why=" + why + ")");
// We must get this work done here because the power manager will drop
// the wake lock and let the system suspend once this function returns.
@@ -5234,24 +5241,11 @@
}
}
- private void wakeUpFromPowerKey(long eventTime) {
- wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey);
- }
-
- private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {
- if (!wakeInTheaterMode && isTheaterModeEnabled()) {
- return false;
- }
-
- mPowerManager.wakeUp(wakeTime);
- return true;
- }
-
// Called on the PowerManager's Notifier thread.
@Override
- public void wakingUp() {
+ public void startedWakingUp() {
EventLog.writeEvent(70000, 1);
- if (DEBUG_WAKEUP) Slog.i(TAG, "Waking up...");
+ if (DEBUG_WAKEUP) Slog.i(TAG, "Started waking up...");
// Since goToSleep performs these functions synchronously, we must
// do the same here. We cannot post this work to a handler because
@@ -5279,6 +5273,25 @@
}
}
+ // Called on the PowerManager's Notifier thread.
+ @Override
+ public void finishedWakingUp() {
+ if (DEBUG_WAKEUP) Slog.i(TAG, "Finished waking up...");
+ }
+
+ private void wakeUpFromPowerKey(long eventTime) {
+ wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey);
+ }
+
+ private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {
+ if (!wakeInTheaterMode && isTheaterModeEnabled()) {
+ return false;
+ }
+
+ mPowerManager.wakeUp(wakeTime);
+ return true;
+ }
+
private void finishKeyguardDrawn() {
synchronized (mLock) {
if (!mAwake || mKeyguardDrawComplete) {
@@ -5771,7 +5784,7 @@
synchronized (mLock) {
mSystemBooted = true;
}
- wakingUp();
+ startedWakingUp();
screenTurningOn(null);
}