Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ic643bc07,I4bef927b into mnc-dev

Browse Source 
* changes:
  Lower protection level of the dangerous Bluetooth permissions
  Update sensors permission group name string
This commit is contained in:
Svet Ganov
2015-06-12 01:36:25 +00:00
committed by Android (Google) Code Review
parent eb91ca56db d81897d023
commit 592d3d35a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/AndroidManifest.xml
View File

@@ -912,13 +912,13 @@
<permission android:name="android.permission.BLUETOOTH" <permission android:name="android.permission.BLUETOOTH"
android:description="@string/permdesc_bluetooth" android:description="@string/permdesc_bluetooth"
android:label="@string/permlab_bluetooth" android:label="@string/permlab_bluetooth"
android:protectionLevel="dangerous" /> android:protectionLevel="normal" />
<!-- Allows applications to discover and pair bluetooth devices --> <!-- Allows applications to discover and pair bluetooth devices -->
<permission android:name="android.permission.BLUETOOTH_ADMIN" <permission android:name="android.permission.BLUETOOTH_ADMIN"
android:description="@string/permdesc_bluetoothAdmin" android:description="@string/permdesc_bluetoothAdmin"
android:label="@string/permlab_bluetoothAdmin" android:label="@string/permlab_bluetoothAdmin"
android:protectionLevel="dangerous" /> android:protectionLevel="normal" />
<!-- @SystemApi Allows applications to pair bluetooth devices without user interaction, and to <!-- @SystemApi Allows applications to pair bluetooth devices without user interaction, and to
allow or disallow phonebook access or message access. allow or disallow phonebook access or message access.

2
core/res/res/values/strings.xml
View File

@@ -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. --> <!-- 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> <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. --> <!-- 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. --> <!-- Title for the capability of an accessibility service to retrieve window content. -->
<string name="capability_title_canRetrieveWindowContent">Retrieve window content</string> <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>