diff options
| author | Matthew Xie <mattx@google.com> | 2011-07-26 21:27:34 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2011-07-27 17:35:48 -0700 |
| commit | 2036ebd8896bbabbbe04db34c9e7d8a1be6fe32a (patch) | |
| tree | e395a99bd8b7675149186193288d6949a1d5ccbb /src/com/android/settings/bluetooth/BluetoothPermissionActivity.java | |
| parent | a7c32ad74996c9fcb0d1d1481f191f0720197e49 (diff) | |
| download | packages_apps_Settings-2036ebd8896bbabbbe04db34c9e7d8a1be6fe32a.tar.gz packages_apps_Settings-2036ebd8896bbabbbe04db34c9e7d8a1be6fe32a.tar.bz2 packages_apps_Settings-2036ebd8896bbabbbe04db34c9e7d8a1be6fe32a.zip | |
Save changed name from CachedBluetoothDevice to native storage
The change preserves the friendly name change over power cycle.
bug 5081605
Change-Id: I2b2cce5a789c72d52439511c42df369639eb0b4b
Diffstat (limited to 'src/com/android/settings/bluetooth/BluetoothPermissionActivity.java')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothPermissionActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 1a0965c146..4d96140011 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -130,7 +130,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements } private String createConnectionDisplayText() { - String mRemoteName = mDevice != null ? mDevice.getName() : null; + String mRemoteName = mDevice != null ? mDevice.getAliasName() : null; if (mRemoteName == null) mRemoteName = getString(R.string.unknown); String mMessage1 = getString(R.string.bluetooth_connection_dialog_text, @@ -139,7 +139,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements } private String createPbapDisplayText() { - String mRemoteName = mDevice != null ? mDevice.getName() : null; + String mRemoteName = mDevice != null ? mDevice.getAliasName() : null; if (mRemoteName == null) mRemoteName = getString(R.string.unknown); String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text, |