PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save changed name from CachedBluetoothDevice to native storage

Browse Source 
The change preserves the friendly name change over power cycle.
bug 5081605

Change-Id: I2b2cce5a789c72d52439511c42df369639eb0b4b
This commit is contained in:
Matthew Xie
2011-07-26 21:27:34 -07:00
parent a7c32ad749
commit 2036ebd889
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothPairingRequest.java
View File

@@ -82,7 +82,7 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
if (TextUtils.isEmpty(name)) {
name = device != null ? device.getName() :
name = device != null ? device.getAliasName() :
context.getString(android.R.string.unknownName);
}

4
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -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,

2
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -83,7 +83,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
context.getString(R.string.bluetooth_connection_permission_request),
System.currentTimeMillis());
String deviceName = device != null ? device.getName() : null;
String deviceName = device != null ? device.getAliasName() : null;
notification.setLatestEventInfo(context,
context.getString(R.string.bluetooth_connection_permission_request),
context.getString(R.string.bluetooth_connection_notif_message, deviceName),

6
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -326,8 +326,8 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
mName = mDevice.getAddress();
} else {
mName = name;
mDevice.setAlias(name);
}
// TODO: save custom device name in preferences
dispatchAttributesChanged();
}
}
@@ -338,7 +338,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
}
private void fetchName() {
mName = mDevice.getName();
mName = mDevice.getAliasName();
if (TextUtils.isEmpty(mName)) {
mName = mDevice.getAddress();
@@ -422,7 +422,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);
if (DEBUG) {
Log.e(TAG, "updating profiles for " + mDevice.getName());
Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());

2
src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -104,7 +104,7 @@ final class CachedBluetoothDeviceManager {
return cachedDevice.getName();
}
String name = device.getName();
String name = device.getAliasName();
if (name != null) {
return name;
}

2
src/com/android/settings/bluetooth/DockEventReceiver.java
View File

@@ -54,7 +54,7 @@ public final class DockEventReceiver extends BroadcastReceiver {
if (DEBUG) {
Log.d(TAG, "Action: " + intent.getAction() + " State:" + state + " Device: "
+ (device == null ? "null" : device.getName()));
+ (device == null ? "null" : device.getAliasName()));
}
if (Intent.ACTION_DOCK_EVENT.equals(intent.getAction())

2
src/com/android/settings/bluetooth/DockService.java
View File

@@ -424,7 +424,7 @@ public final class DockService extends Service implements ServiceListener {
if (DEBUG) {
Log.d(TAG, "Action: " + intent.getAction() + " State:" + state
+ " Device: " + (device == null ? "null" : device.getName()));
+ " Device: " + (device == null ? "null" : device.getAliasName()));
}
if (device == null) {