Merge "Make sure that the device name is not null before returning it" into oc-dev (0f20dcdc) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class CachedBluetoothDeviceManager {
		*/
		public String getName(BluetoothDevice device) {
		CachedBluetoothDevice cachedDevice = findDevice(device);
		if (cachedDevice != null) {
		if (cachedDevice != null && cachedDevice.getName() != null) {
		return cachedDevice.getName();
		}