diff options
| author | Billy Lau <billylau@google.com> | 2015-07-14 18:22:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 18:22:30 +0000 |
| commit | 52df60d83dc48818aacbe1721e6aaa9be39e8451 (patch) | |
| tree | 8a5ad4f8dc7a9fe66fd13b7964c35966d5d5d984 /AndroidManifest.xml | |
| parent | 8505d4a51d1112ea71f7df680cf85378a9567bde (diff) | |
| parent | 7f70ba18e6760c2539704c16cf3865bf49953d50 (diff) | |
| download | packages_apps_Settings-52df60d83dc48818aacbe1721e6aaa9be39e8451.tar.gz packages_apps_Settings-52df60d83dc48818aacbe1721e6aaa9be39e8451.tar.bz2 packages_apps_Settings-52df60d83dc48818aacbe1721e6aaa9be39e8451.zip | |
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 52889a68d..3367345dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2516,5 +2516,23 @@ </intent-filter> </provider> + <activity android:name="Settings$OverlaySettingsActivity" + android:label="@string/draw_overlay_title" + android:taskAffinity=""> + <intent-filter android:priority="1"> + <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name="Settings$WriteSettingsActivity" + android:label="@string/write_settings_title" + android:taskAffinity=""> + <intent-filter android:priority="1"> + <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + </application> </manifest> |