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 /core/java/android/provider | |
| 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 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 550dd9e..4e13758 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -574,22 +574,7 @@ public final class Settings { */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_MANAGE_OVERLAY_PERMISSION = - "android.settings.action.MANAGE_OVERLAY_PERMISSION"; - - /** - * Activity Action: Show settings to toggle permission to allow app to - * read/write system settings. - * <p> - * In some cases, a matching Activity may not exist, so ensure you - * safeguard against this. - * <p> - * Input: Nothing. - * <p> - * Output: Nothing. - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_MANAGE_WRITE_SETTINGS = - "android.settings.action.MANAGE_WRITE_SETTINGS"; + "android.settings.MANAGE_OVERLAY_PERMISSION"; /** * Activity Action: Show screen of details about a particular application. |