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

am 7b354367: am a383452a: Merge change 25125 into eclair

Browse Source 
Merge commit '7b354367af8407dd6ee89fe4875047b1134eda9a'

* commit '7b354367af8407dd6ee89fe4875047b1134eda9a':
  Show name for incoming pairing requests.
This commit is contained in:
Jaikumar Ganesh
2009-09-17 06:41:40 -07:00
committed by Android Git Automerger
parent 3f8c5d812d 7b354367af
commit 71328bfc26
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -140,7 +140,12 @@ public class CachedBluetoothDeviceManager {
*/
public String getName(BluetoothDevice device) {
CachedBluetoothDevice cachedDevice = findDevice(device);
return cachedDevice != null ? cachedDevice.getName() : device.getAddress();
if (cachedDevice != null) return cachedDevice.getName();
String name = device.getName();
if (name != null) return name;
return device.getAddress();
}
private void dispatchDeviceAdded(CachedBluetoothDevice cachedDevice) {

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

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