diff options
| author | Jaikumar Ganesh <jaikumarg@android.com> | 2011-03-29 20:09:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 20:09:08 -0700 |
| commit | a4f55f7702bca57c0dbb543ee3e2cb1686e616fc (patch) | |
| tree | 137c4d45571a7ab10e45181187c3dffeffb8f45e | |
| parent | e92baf9466a26ea83d2b4f59b2b232b9fc641bd8 (diff) | |
| parent | c298d29b081e4240c80750e9431b7189d0b38513 (diff) | |
| download | android_packages_apps_Bluetooth-a4f55f7702bca57c0dbb543ee3e2cb1686e616fc.tar.gz android_packages_apps_Bluetooth-a4f55f7702bca57c0dbb543ee3e2cb1686e616fc.tar.bz2 android_packages_apps_Bluetooth-a4f55f7702bca57c0dbb543ee3e2cb1686e616fc.zip | |
am c298d29b: Merge "Add check for null pointer to avoid crash."
* commit 'c298d29b081e4240c80750e9431b7189d0b38513':
Add check for null pointer to avoid crash.
| -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 3ea207eb3..11a318443 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppPreference.java +++ b/src/com/android/bluetooth/opp/BluetoothOppPreference.java @@ -126,7 +126,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(); |