diff options
| author | Jaikumar Ganesh <jaikumarg@android.com> | 2011-03-29 19:55:21 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-29 19:55:21 -0700 |
| commit | c298d29b081e4240c80750e9431b7189d0b38513 (patch) | |
| tree | 1f90acebf5a8390b8db6043c52c013169ae02989 | |
| parent | 78c1c0eee41a1b6c6a259661d62d62d78841ad1f (diff) | |
| parent | 98a53e5bdb2500109c304f2b5364c1715ab745d8 (diff) | |
| download | android_packages_apps_Bluetooth-c298d29b081e4240c80750e9431b7189d0b38513.tar.gz android_packages_apps_Bluetooth-c298d29b081e4240c80750e9431b7189d0b38513.tar.bz2 android_packages_apps_Bluetooth-c298d29b081e4240c80750e9431b7189d0b38513.zip | |
Merge "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(); |