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

Commit 42723c5e authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes Idd1258bc,Ie47d71b5,I92007320,I6e817cfc,If90840d3, ... 

* changes:
  HEARINGAID Enforce priviled on setVolume
  Removed useless testapi annotation
  Remove duplicate method exposure
  Remove non logical permission on api
  Fix some API recently added
  API Changes needed for apex to build
parents fa3e4cb6 701ebfc5

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+4 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,8 @@ public class AdapterService extends Service { 
                return new ArrayList<>();

            }



            enforceBluetoothPrivilegedPermission(service);



            return service.mDatabaseManager.getMostRecentlyConnectedDevices();

        }
@@ -2159,6 +2161,8 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothPrivilegedPermission(service);



            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp != null) {

                deviceProp.setBondingInitiatedLocally(false);

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);

    }