b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth

Also added test app.

1 files changed, 13 insertions, 3 deletions

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cf2e03c..8a0ce21 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.tests">
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="BluetoothRequestPermissionTest"
+            android:label="Bluetooth Perm Test" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation android:name="SettingsLaunchPerformance"
@@ -26,4 +36,4 @@
         android:label="Settings Launch Performance">
     </instrumentation>
 
-</manifest> 
+</manifest>