OSDN Git Service

Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager"
authorLei Yu <jackqdyulei@google.com>
Mon, 17 Sep 2018 18:22:57 +0000 (18:22 +0000)
committerLei Yu <jackqdyulei@google.com>
Mon, 17 Sep 2018 22:15:14 +0000 (22:15 +0000)
commit499013b05ecd844429b3852f720f04ee0494e66d
tree93678cdb81d8564fe78ef78c8c8e2141ac2b7f4f
parent3029efc5f7047596315119bdb1e7056ba26cd071
Revert "call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager"

This reverts commit 3029efc5f7047596315119bdb1e7056ba26cd071.

Reason for revert:
To fix null pointer crash in Pairing dialog. Dialog maybe triggered by intent, in which LocalBluetoothManager couldn't have instance for BluetoothDevice and will return null. As a result, we need to depend on method in CachedBluetoothManager to handle it.

Bug: 115754654
Bug: 112735753
Change-Id: I1ebf1f1c2829cfb75e6c382df5acf785fe54a185
src/com/android/settings/bluetooth/BluetoothPairingController.java
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java