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

Commit 8db43964 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

BluetoothHearingAid System APIs now throw an exception if a null 

BluetoothDevice is passed in

Bug: 149238489
Test: Manual
Merged-In: I594f558bfe1e286bf74dd8dc3db4c8497fd0a025
Change-Id: I594f558bfe1e286bf74dd8dc3db4c8497fd0a025
parent 20968800

framework/java/android/bluetooth/BluetoothHearingAid.java

+10 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        verifyDeviceNotNull(device, "setConnectionPolicy");

        final IBluetoothHearingAid service = getService();

        try {

            if (service != null && isEnabled()
@@ -435,6 +436,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

        verifyDeviceNotNull(device, "getConnectionPolicy");

        final IBluetoothHearingAid service = getService();

        try {

            if (service != null && isEnabled()
@@ -511,6 +513,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
        if (VDBG) {

            log("getHiSyncId(" + device + ")");

        }

        verifyDeviceNotNull(device, "getConnectionPolicy");

        final IBluetoothHearingAid service = getService();

        try {

            if (service == null) {
@@ -584,6 +587,13 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
        return false;

    }



    private void verifyDeviceNotNull(BluetoothDevice device, String methodName) {

        if (device == null) {

            Log.e(TAG, methodName + ": device param is null");

            throw new IllegalArgumentException("Device cannot be null");

        }

    }



    private boolean isValidDevice(BluetoothDevice device) {

        if (device == null) return false;