summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-11-13 21:05:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-13 21:05:31 +0000
commit3415634c2e8a8979291dd60b89f2985e31e5e2f4 (patch)
treec15393db903ca5abf1a7fbc430248ee0ce9f5da2 /policy
parent46112fe18b0fa9d8d9c330191184a5e1e1b914ec (diff)
parent72f1e3b9c9992bfc3449c5441bc8e50e7b05f083 (diff)
downloadframeworks_base-3415634c2e8a8979291dd60b89f2985e31e5e2f4.zip
frameworks_base-3415634c2e8a8979291dd60b89f2985e31e5e2f4.tar.gz
frameworks_base-3415634c2e8a8979291dd60b89f2985e31e5e2f4.tar.bz2
am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
* commit '72f1e3b9c9992bfc3449c5441bc8e50e7b05f083': Improve screen brightness boost behavior.
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 24de9a8..08e1b6b 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -998,6 +998,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
break;
case MULTI_PRESS_POWER_BRIGHTNESS_BOOST:
+ Slog.i(TAG, "Starting brightness boost.");
+ if (!interactive) {
+ wakeUpFromPowerKey(eventTime);
+ }
mPowerManager.boostScreenBrightness(eventTime);
break;
}