summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/sound
diff options
context:
space:
mode:
authorRahul Sabnis <rahulsabnis@google.com>2019-10-22 15:34:40 -0700
committerRahul Sabnis <rahulsabnis@google.com>2019-10-22 15:34:40 -0700
commitc96469f2bd033816e85d5e61e3913a63cb2522a5 (patch)
treedd8842ba20c624f0171764724900f56604fe374b /src/com/android/settings/sound
parenta67ca4cfd77439f0cfcc9b5389af175cd2e0b057 (diff)
downloadpackages_apps_Settings-c96469f2bd033816e85d5e61e3913a63cb2522a5.tar.gz
packages_apps_Settings-c96469f2bd033816e85d5e61e3913a63cb2522a5.tar.bz2
packages_apps_Settings-c96469f2bd033816e85d5e61e3913a63cb2522a5.zip
Refactor usages of getAliasName to use getAlias in Settings
Bug: 142352567 Test: Manual Change-Id: I40af1b1e0453900fd888317ae46b20ef359db473
Diffstat (limited to 'src/com/android/settings/sound')
-rw-r--r--src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java4
-rw-r--r--src/com/android/settings/sound/MediaOutputPreferenceController.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 9157477796..d72f50314c 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -66,7 +66,7 @@ public class HandsFreeProfileOutputPreferenceController extends AudioSwitchPrefe
final BluetoothDevice btDevice = mConnectedDevices.get(connectedDeviceIndex);
mSelectedIndex = connectedDeviceIndex;
setActiveBluetoothDevice(btDevice);
- listPreference.setSummary(btDevice.getAliasName());
+ listPreference.setSummary(btDevice.getAlias());
}
return true;
}
@@ -143,7 +143,7 @@ public class HandsFreeProfileOutputPreferenceController extends AudioSwitchPrefe
mediaValues[mSelectedIndex] = defaultSummary;
for (int i = 0, size = mConnectedDevices.size(); i < size; i++) {
final BluetoothDevice btDevice = mConnectedDevices.get(i);
- mediaOutputs[i] = btDevice.getAliasName();
+ mediaOutputs[i] = btDevice.getAlias();
mediaValues[i] = btDevice.getAddress();
if (btDevice.equals(activeDevice)) {
// select the active connected device.
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index 1831ad6d70..b133713f56 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -76,7 +76,7 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
mPreference.setVisible(deviceConnected);
mPreference.setSummary((activeDevice == null) ?
mContext.getText(R.string.media_output_default_summary) :
- activeDevice.getAliasName());
+ activeDevice.getAlias());
}
@Override