diff options
| author | 2015-06-12 01:36:25 +0000 | |
|---|---|---|
| committer | 2015-06-12 01:36:27 +0000 | |
| commit | 592d3d35a6ae4eee0645bf92bc8cf4ab9d0d9b7b (patch) | |
| tree | c8efd3ea395af8d77510deb2cb19c0f673570bca | |
| parent | eb91ca56db95f7aaf1b7e30294a555fd43ba1c9d (diff) | |
| parent | d81897d0232e4629340a541bf6ffb8dcfae0fd52 (diff) | |
Merge changes Ic643bc07,I4bef927b into mnc-dev
* changes:
Lower protection level of the dangerous Bluetooth permissions
Update sensors permission group name string
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e58ac1d87355..47b180fad31e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f6af19c7f045..19fc4a1478e1 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> |