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

Commit 3ed03080 authored by Zach Johnson's avatar Zach Johnson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bluetooth-certificate-change" into tm-dev 

* changes:
  Make permissions Bluetooth needs role-available
  Adding bt permissions to the priv app allowlist
parents 4c8378aa fafd819b

core/res/AndroidManifest.xml

+10 −10
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ 


    <!-- @SystemApi @hide Allows applications to register network factory or agent -->

    <permission android:name="android.permission.NETWORK_FACTORY"

                android:protectionLevel="signature" />

                android:protectionLevel="signature|role" />



    <!-- @SystemApi @hide Allows applications to access network stats provider -->

    <permission android:name="android.permission.NETWORK_STATS_PROVIDER"
@@ -2275,13 +2275,13 @@ 
         @hide

    -->

    <permission android:name="android.permission.BLUETOOTH_MAP"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- Allows bluetooth stack to access files

         @hide This should only be used by Bluetooth apk.

    -->

    <permission android:name="android.permission.BLUETOOTH_STACK"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- Allows uhid write access for creating virtual input devices

         @hide
@@ -2552,7 +2552,7 @@ 
    <!-- Allows access to configure network interfaces, configure/use IPSec, etc.

         @hide -->

    <permission android:name="android.permission.NET_ADMIN"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- Allows registration for remote audio playback. @hide -->

    <permission android:name="android.permission.REMOTE_AUDIO_PLAYBACK"
@@ -2676,7 +2676,7 @@ 
    <!-- Allows listen permission to always reported system signal strength.

         @hide Used internally. -->

    <permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- @SystemApi Protects the ability to register any PhoneAccount with

         PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount
@@ -3911,7 +3911,7 @@ 
         Not for use by third party apps.

         @hide -->

    <permission android:name="android.permission.MANAGE_APP_OPS_MODES"

        android:protectionLevel="signature|installer|verifier" />

        android:protectionLevel="signature|installer|verifier|role" />



    <!-- @SystemApi Allows an application to open windows that are for use by parts

         of the system user interface.
@@ -4792,7 +4792,7 @@ 
    <!-- Allows an application to manage the companion devices.

         @hide -->

    <permission android:name="android.permission.MANAGE_COMPANION_DEVICES"

                android:protectionLevel="signature" />

                android:protectionLevel="signature|role" />



    <!-- Allows an application to subscribe to notifications about the presence status change

         of their associated companion device
@@ -5041,7 +5041,7 @@ 
    <!-- @TestApi Allows an application to query audio related state.

         @hide -->

    <permission android:name="android.permission.QUERY_AUDIO_STATE"

                android:protectionLevel="signature" />

                android:protectionLevel="signature|role" />



    <!-- Allows an application to modify what effects are applied to all audio

         (matching certain criteria) from any application.
@@ -5114,7 +5114,7 @@ 
        @hide

    -->

   <permission android:name="android.permission.DEVICE_POWER"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- Allows toggling battery saver on the system.

         Superseded by DEVICE_POWER permission. @hide @SystemApi
@@ -5140,7 +5140,7 @@ 


   <!-- @hide Allows low-level access to tun tap driver -->

    <permission android:name="android.permission.NET_TUNNELING"

        android:protectionLevel="signature" />

        android:protectionLevel="signature|role" />



    <!-- Run as a manufacturer test application, running as the root user.

         Only available when the device is running in manufacturer test mode.

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -2918,6 +2918,11 @@ 
        com.android.settings.intelligence

    </string>



    <!-- System bluetooth stack package name -->

    <string name="config_systemBluetoothStack" translatable="false">

        com.android.bluetooth.services

    </string>



    <!-- Flag indicating that the media framework should not allow changes or mute on any

         stream or global volumes. -->

    <bool name="config_useFixedVolume">false</bool>

core/res/res/values/public-staging.xml

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ 
    <public name="safety_protection_display_text" />

    <!-- @hide @SystemApi -->

    <public name="config_systemSettingsIntelligence" />

    <!-- @hide -->

    <public name="config_systemBluetoothStack" />

  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01db0000">

data/etc/privapp-permissions-platform.xml

+24 −0
Original line number Diff line number Diff line
@@ -33,6 +33,30 @@ applications that come with the platform 
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.bluetooth.services">

        <permission name="android.permission.DUMP"/>

        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.TETHER_PRIVILEGED"/>

        <permission name="android.permission.CALL_PRIVILEGED"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>

        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>

        <permission name="android.permission.UPDATE_DEVICE_STATS"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS"/>

        <permission name="android.permission.NFC_HANDOVER_STATUS"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>

        <permission name="android.permission.REAL_GET_TASKS"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>

        <permission name="android.permission.WRITE_APN_SETTINGS"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.backupconfirm">

        <permission name="android.permission.BACKUP"/>

        <permission name="android.permission.CRYPT_KEEPER"/>