diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-01 18:19:31 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-05-01 18:19:31 -0700 |
| commit | fb0448ab4b42c1b390cd75c3660ec0de511b7b3b (patch) | |
| tree | 157dff51891fa740fb36afe2c1f3e1e986dc7ec9 /services/core/java/com/android/server/power | |
| parent | 615d1337fcb4b7e16706e615b19305eea7b689bb (diff) | |
| parent | 4f8cd18880f1a63d2db376c3bfbfe11c55e6f1ee (diff) | |
| download | frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.zip frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.tar.gz frameworks_base-fb0448ab4b42c1b390cd75c3660ec0de511b7b3b.tar.bz2 | |
resolved conflicts for merge of 4f8cd188 to master
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
Diffstat (limited to 'services/core/java/com/android/server/power')
| -rw-r--r-- | services/core/java/com/android/server/power/Notifier.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index d84e8e1..d9e95c7 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -409,7 +409,7 @@ final class Notifier { EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 1, 0, 0, 0); - mPolicy.screenTurningOn(mScreenOnListener); + mPolicy.wakingUp(mScreenOnListener); mActivityManagerInternal.wakingUp(); if (ActivityManagerNative.isSystemReady()) { @@ -460,7 +460,7 @@ final class Notifier { EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 0, why, 0, 0); - mPolicy.screenTurnedOff(why); + mPolicy.goingToSleep(why); mActivityManagerInternal.goingToSleep(); if (ActivityManagerNative.isSystemReady()) { |