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

am 592d3d35: Merge changes Ic643bc07,I4bef927b into mnc-dev

Browse Source 
* commit '592d3d35a6ae4eee0645bf92bc8cf4ab9d0d9b7b':
  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:42:29 +00:00
committed by Android Git Automerger
parent 50556ff61c 592d3d35a6
commit cdf20eacec
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"
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.

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. -->
<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>