diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-07-07 08:32:44 -0700 |
|---|---|---|
| committer | Ian Pedowitz <ijpedowitz@google.com> | 2015-07-07 08:32:44 -0700 |
| commit | 937edac8e8583023019b625dd426ebf65169e30d (patch) | |
| tree | f509b9de0dda46884f2c49fbb3993e9e60910986 /api | |
| parent | 46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba (diff) | |
| download | frameworks_base-937edac8e8583023019b625dd426ebf65169e30d.zip frameworks_base-937edac8e8583023019b625dd426ebf65169e30d.tar.gz frameworks_base-937edac8e8583023019b625dd426ebf65169e30d.tar.bz2 | |
Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
This reverts commit d6b404c72da7e2475508c7d5948494b2e9b1a262.
This CL seems to have broken the build, causing GMSCore to continuously
crash.
Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 27e6ad1..9ead86d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26395,8 +26395,7 @@ package android.provider { field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; - field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; + field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index c1b6205..af8a1b8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28451,8 +28451,7 @@ package android.provider { field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; - field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; + field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; |