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

Merge "Refactor usages of getAliasName to use getAlias in Settings" am: eed0f8816b am: 4f85f36e7d

Browse Source 
am: 2a60040d29

Change-Id: If24afc1a316da64fbf49ad08ee761e5af7dde4b7
This commit is contained in:
Rahul Sabnis
2019-11-05 11:47:05 -08:00
committed by android-build-merger
parent 16cc74021f 2a60040d29
commit c5a039a89f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ public final class BluetoothPairingService extends Service {
String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
if (TextUtils.isEmpty(name)) {
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
name = device != null ? device.getAliasName() : res.getString(android.R.string.unknownName);
name = device != null ? device.getAlias() : res.getString(android.R.string.unknownName);
}
Log.d(TAG, "Show pairing notification for " + mDevice.getAddress() + " (" + name + ")");

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

@@ -125,7 +125,7 @@ public final class Utils {
}
public static String createRemoteName(Context context, BluetoothDevice device) {
String mRemoteName = device != null ? device.getAliasName() : null;
String mRemoteName = device != null ? device.getAlias() : null;
if (mRemoteName == null) {
mRemoteName = context.getString(R.string.unknown);