diff options
author | Dianne Hackborn <hackbod@google.com> | 2015-04-29 20:51:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 20:51:04 +0000 |
commit | 8756f9b34dd04cabae7487bd1941008a6c98c4c6 (patch) | |
tree | addf56c050d2963c16496111cd2b8905be629372 /core/res | |
parent | 94582c5fb632b17b751729a929ff94ef8aa216a1 (diff) | |
parent | 599a4e0ea864769e6cd1d04bd766c472b16be4c7 (diff) | |
download | frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.zip frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.tar.gz frameworks_base-8756f9b34dd04cabae7487bd1941008a6c98c4c6.tar.bz2 |
am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '599a4e0ea864769e6cd1d04bd766c472b16be4c7':
Implement user-settable power save whitelist.
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/AndroidManifest.xml | 2 |
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" /> |