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

Commit 206f87c5 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev 

* commit 'cce52bd3':
  Fix NPE in bluetooth Permission Activity
parents 5b0e875d cce52bd3

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

        }

    }

}