summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/bluetooth/opp/BluetoothOppPreference.java2
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();