Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 592d3d35 authored by Svet Ganov's avatar Svet Ganov Committed by Android (Google) Code Review
Browse files

Merge changes Ic643bc07,I4bef927b into mnc-dev 

* changes:
  Lower protection level of the dangerous Bluetooth permissions
  Update sensors permission group name string
parents eb91ca56 d81897d0

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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.

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>