commit c6a074c80d5279c285a310a6a62ee9bf6fe3517b
author Svetoslav Ganov <svetoslavganov@google.com> Fri Jul 22 20:08:41 2016 -0700
committer Marie Janssen <jamuraa@google.com> Mon Dec 12 09:44:39 2016 -0800
tree f0b094fd2b9cae8232582153bb197e585e91da87
parent 5c6e7a211614c7f9056c22393500097cf6ea11f0

DO NOT MERGE Add Bluetooth toggle prompts - settings

If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23cd219..068e4e0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2070,10 +2070,11 @@
                   android:label="@string/bluetooth_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@style/BluetoothPermission">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
                 <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
+                <action android:name="android.bluetooth.adapter.action.REQUEST_DISABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>