Merge "Do not overwrite alias with device name" into lmp-dev (72c34e6a) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

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

+18 −7

Original line number	Original line	Diff line number	Diff line
	@@ -381,15 +381,26 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
	return mName;		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) {		void setName(String name) {
	if (!mName.equals(name)) {		if (!mName.equals(name)) {
	if (TextUtils.isEmpty(name)) {
	// TODO: use friendly name for unknown device (bug 1181856)
	mName = mDevice.getAddress();
	} else {
	mName = name;		mName = name;
	mDevice.setAlias(name);		mDevice.setAlias(name);
	}
	dispatchAttributesChanged();		dispatchAttributesChanged();
	}		}
	}		}