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

Commit 40b77fe0 authored by Ganesh Ganapathi Batta's avatar Ganesh Ganapathi Batta Committed by Matthew Xie
Browse files

Fix NPE in bluetooth Permission Activity 

This fixes a NPE by ensuring that cached device  list has
a cached device associated with a given BDA before accessing
the cached device
Bug:5964529

Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
parent 6665ee32

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

100644 → 100755
+8 −1
Original line number Diff line number Diff line
@@ -251,6 +251,13 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
        CachedBluetoothDeviceManager cachedDeviceManager =

            bluetoothManager.getCachedDeviceManager();

        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);

        if (cachedDevice != null ) {

            cachedDevice.setPhonebookPermissionChoice(permissionChoice);

        } else {

            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),

                                                         bluetoothManager.getProfileManager(),

                                                         mDevice);

            cachedDevice.setPhonebookPermissionChoice(permissionChoice);

        }

    }

}