diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-11 00:28:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 00:28:20 +0000 |
| commit | 09e77852d8c25854894358789807a73c3e79ddf0 (patch) | |
| tree | 5106dec8198311fc865e151a6599310013a239bb /core/res | |
| parent | 83682890190c9a5b73e1742a58c1e017ac418ee2 (diff) | |
| parent | 5cf89a011932f1af9361e7b713e33ff5c5af3e61 (diff) | |
| download | frameworks_base-09e77852d8c25854894358789807a73c3e79ddf0.zip frameworks_base-09e77852d8c25854894358789807a73c3e79ddf0.tar.gz frameworks_base-09e77852d8c25854894358789807a73c3e79ddf0.tar.bz2 | |
am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
Fix issue #23037899: Support for Battery Optimization permission + Dialog
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 53b553e8..629d14b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2257,6 +2257,13 @@ <permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" android:protectionLevel="system|signature" /> + <!-- Permission an application must hold in order to use + {@link android.provider.Settings#ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}. + This is a normal permission: an app requesting it will always be granted the + permission, without the user needing to approve or see it. --> + <permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" + android:protectionLevel="normal" /> + <!-- @SystemApi Allows an application to collect battery statistics --> <permission android:name="android.permission.BATTERY_STATS" android:protectionLevel="signature|privileged|development" /> |