summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-03-25 16:16:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-25 16:16:42 +0000
commit3309be5e7bc782d89adaf4abca5f1f81649c655f (patch)
tree7eff6568f655f986a77fdda2b15c41a7878a0998 /core/res
parentb0d49833be8a00a8466aeea6a839869371a90425 (diff)
parent21b7e6de94b1e4d0bbe2f1a13ac19f491ff466ed (diff)
downloadframeworks_base-3309be5e7bc782d89adaf4abca5f1f81649c655f.zip
frameworks_base-3309be5e7bc782d89adaf4abca5f1f81649c655f.tar.gz
frameworks_base-3309be5e7bc782d89adaf4abca5f1f81649c655f.tar.bz2
am 21b7e6de: am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit '21b7e6de94b1e4d0bbe2f1a13ac19f491ff466ed': Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 59dafed..75ba16b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -77,6 +77,8 @@
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" />
+ <protected-broadcast android:name="android.os.action.SCREEN_BRIGHTNESS_BOOST_CHANGED" />
+
<protected-broadcast android:name="android.app.action.ENTER_CAR_MODE" />
<protected-broadcast android:name="android.app.action.EXIT_CAR_MODE" />
<protected-broadcast android:name="android.app.action.ENTER_DESK_MODE" />