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

Commit d631b959 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Idd1258bc,Ie47d71b5,I92007320,I6e817cfc,If90840d3, ... am: 42723c5e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1982213

Change-Id: I71c549374188bbbb42bdc879c2cce709558fc960
parents 4f1a609a 42723c5e

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+3 −0
Original line number Diff line number Diff line
@@ -536,7 +536,10 @@ public class HearingAidService extends ProfileService { 
                .getProfileConnectionPolicy(device, BluetoothProfile.HEARING_AID);

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    void setVolume(int volume) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

        mHearingAidNativeInterface.setVolume(volume);

    }

system/binder/android/bluetooth/IBluetoothHearingAid.aidl

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ oneway interface IBluetoothHearingAid { 
    void setConnectionPolicy(in BluetoothDevice device, int connectionPolicy, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void setVolume(int volume, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")