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

4
src/com/android/settings/media/MediaOutputIndicatorSlice.java
View File

@@ -148,14 +148,14 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
// Return Hearing Aid device name if it is active
BluetoothDevice activeDevice = findActiveHearingAidDevice();
if (activeDevice != null) {
return activeDevice.getAliasName();
return activeDevice.getAlias();
}
// Return A2DP device name if it is active
final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();
if (a2dpProfile != null) {
activeDevice = a2dpProfile.getActiveDevice();
if (activeDevice != null) {
return activeDevice.getAliasName();
return activeDevice.getAlias();
}
}
// No active device, return default summary