summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-04-29 21:02:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 21:02:36 +0000
commitc5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7 (patch)
tree9d246ae7f3371ef8ce3fa72c71b37c1f0e0f581a /core/res
parentec317987e06c9083a54bd32b5d10eee898345fe5 (diff)
parent8756f9b34dd04cabae7487bd1941008a6c98c4c6 (diff)
downloadframeworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.zip
frameworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.tar.gz
frameworks_base-c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7.tar.bz2
am 8756f9b3: am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '8756f9b34dd04cabae7487bd1941008a6c98c4c6': Implement user-settable power save whitelist.
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 45c078d..942e6a6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -79,6 +79,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.DEVICE_IDLE_MODE_CHANGED" />
+ <protected-broadcast android:name="android.os.action.POWER_SAVE_WHITELIST_CHANGED" />
<protected-broadcast android:name="android.os.action.SCREEN_BRIGHTNESS_BOOST_CHANGED" />