PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e60a8ebd: am bb334392: Merge change 25354 into eclair

Browse Source 
Merge commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'

* commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
  Fix string name for bluetooth pairing and fix NPE
This commit is contained in:
Jaikumar Ganesh
2009-09-17 12:09:30 -07:00
committed by Android Git Automerger
parent 2633e39108 e60a8ebd0e
commit 18f9d189ba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/LocalBluetoothManager.java
View File

@@ -256,7 +256,8 @@ public class LocalBluetoothManager {
CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device); CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
String name = null; String name = null;
if (cachedDevice == null) { if (cachedDevice == null) {
name = device.getName(); if (device != null) name = device.getName();
if (name == null) { if (name == null) {
name = mContext.getString(R.string.bluetooth_remote_device); name = mContext.getString(R.string.bluetooth_remote_device);
} }