diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-11 00:19:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 00:19:44 +0000 |
| commit | 5cf89a011932f1af9361e7b713e33ff5c5af3e61 (patch) | |
| tree | c30bc3ba311dadc3e421be5324d9951bdda5b7ce /api/system-current.txt | |
| parent | 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc (diff) | |
| parent | b2b020922fb51b88d34a6478209fc232702de318 (diff) | |
| download | frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.zip frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.tar.gz frameworks_base-5cf89a011932f1af9361e7b713e33ff5c5af3e61.tar.bz2 | |
am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
Fix issue #23037899: Support for Battery Optimization permission + Dialog
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8b9af5e..36cd869 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -180,6 +180,7 @@ package android { field public static final java.lang.String REGISTER_SIM_SUBSCRIPTION = "android.permission.REGISTER_SIM_SUBSCRIPTION"; field public static final java.lang.String REMOVE_DRM_CERTIFICATES = "android.permission.REMOVE_DRM_CERTIFICATES"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT"; @@ -28502,6 +28503,7 @@ package android.provider { field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS"; field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; + field public static final java.lang.String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; |