From 678e8532b521b7111b4c1bf7f72aebef764b16d2 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Thu, 11 Jun 2015 15:58:34 -0700
Subject: [PATCH 1/2] Update sensors permission group name string

bug:21784262

Change-Id: I4bef927b7e9de246df8d5ab6cfe7d40f78942fe7
---
 core/res/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5f70cff7b7cf8..0183e3eb80c64 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -596,7 +596,7 @@
     <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permgrouplab_sensors">Sensors</string>
     <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
-    <string name="permgroupdesc_sensors">access data from sensors and wearable devices</string>
+    <string name="permgroupdesc_sensors">access information about your vital signs and physical activity</string>
 
     <!-- Title for the capability of an accessibility service to retrieve window content. -->
     <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>

From d81897d0232e4629340a541bf6ffb8dcfae0fd52 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Thu, 11 Jun 2015 18:24:26 -0700
Subject: [PATCH 2/2] Lower protection level of the dangerous Bluetooth
 permissions

bug:21594947

Change-Id: Ic643bc0768b0fc9adcc3e07661ee34fa59f4ec35
---
 core/res/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8a32c46dcd844..521238bfc4688 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -913,13 +913,13 @@
     <permission android:name="android.permission.BLUETOOTH"
         android:description="@string/permdesc_bluetooth"
         android:label="@string/permlab_bluetooth"
-        android:protectionLevel="dangerous" />
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to discover and pair bluetooth devices -->
     <permission android:name="android.permission.BLUETOOTH_ADMIN"
         android:description="@string/permdesc_bluetoothAdmin"
         android:label="@string/permlab_bluetoothAdmin"
-        android:protectionLevel="dangerous" />
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows applications to pair bluetooth devices without user interaction, and to
          allow or disallow phonebook access or message access.