diff options
| author | martin ma <martin.ma@sonyericsson.com> | 2010-12-06 16:51:28 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-03-08 19:46:33 -0500 |
| commit | db3d9d70300de3adc61ea83ef5122206b7e15d53 (patch) | |
| tree | 13e02056b33c9d1024cf6b60c688c53111a0eba5 | |
| parent | d67d40591c19d2c146dca5fbf91d76d1e7c2ab82 (diff) | |
| download | android_packages_apps_Bluetooth-db3d9d70300de3adc61ea83ef5122206b7e15d53.tar.gz android_packages_apps_Bluetooth-db3d9d70300de3adc61ea83ef5122206b7e15d53.tar.bz2 android_packages_apps_Bluetooth-db3d9d70300de3adc61ea83ef5122206b7e15d53.zip | |
Add check for null pointer to avoid crash.
This is added in order to prevent a crash. Also, updating the name
of a device to null, making it appear as 'Unknown', is probably not
intended.
Change-Id: Ibd3c93741489aae9118ba7b45223d58d5de6812f
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppPreference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppPreference.java b/src/com/android/bluetooth/opp/BluetoothOppPreference.java index 604453a38..1391abaad 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppPreference.java +++ b/src/com/android/bluetooth/opp/BluetoothOppPreference.java @@ -127,7 +127,7 @@ public class BluetoothOppPreference { public void setName(BluetoothDevice remoteDevice, String name) { if (V) Log.v(TAG, "Setname for " + remoteDevice + " to " + name); - if (!name.equals(getName(remoteDevice))) { + if (name != null && !name.equals(getName(remoteDevice))) { Editor ed = mNamePreference.edit(); ed.putString(remoteDevice.getAddress(), name); ed.apply(); |