Merge "Do not overwrite alias with device name" into lmp-dev

src/com/android/settings/bluetooth/BluetoothEventManager.java

@@ -206,7 +206,7 @@ final class BluetoothEventManager {
             }
             cachedDevice.setRssi(rssi);
             cachedDevice.setBtClass(btClass);
-            cachedDevice.setName(name);
+            cachedDevice.setNewName(name);
             cachedDevice.setVisible(true);
         }
     }

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

@@ -381,15 +381,26 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
         return mName;
     }
 
+    /**
+     * Populate name from BluetoothDevice.ACTION_FOUND intent
+     */
+    void setNewName(String name) {
+        if (mName == null) {
+            mName = name;
+            if (mName == null || TextUtils.isEmpty(mName)) {
+                mName = mDevice.getAddress();
+            }
+            dispatchAttributesChanged();
+        }
+    }
+
+    /**
+     * user changes the device name
+     */
     void setName(String name) {
         if (!mName.equals(name)) {
-            if (TextUtils.isEmpty(name)) {
+            mName = name;
-                // TODO: use friendly name for unknown device (bug 1181856)
+            mDevice.setAlias(name);
-                mName = mDevice.getAddress();
-            } else {
-                mName = name;
-                mDevice.setAlias(name);
-            }
             dispatchAttributesChanged();
         }
     }