Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show the connected device more reliably

Browse Source 
Test: manual
Change-Id: Ief39215321e0a283f724dd0b0cdf5b9eeab1e116
Fixes: 72494077
This commit is contained in:
Julia Reynolds
2018-01-25 15:51:45 -05:00
parent 72482d91b2
commit 24cc759de9
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/AudioDeviceInfo.java
View File

@@ -22,6 +22,7 @@ import android.util.SparseIntArray;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Objects;
import java.util.TreeSet;
/**
@@ -176,6 +177,19 @@ public final class AudioDeviceInfo {
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AudioDeviceInfo that = (AudioDeviceInfo) o;
return Objects.equals(getPort(), that.getPort());
}
@Override
public int hashCode() {
return Objects.hash(getPort());
}
private final AudioDevicePort mPort;
AudioDeviceInfo(AudioDevicePort port) {

35
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -59,7 +59,9 @@ import com.android.systemui.statusbar.phone.StatusBar;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -109,8 +111,10 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
private boolean mShowVolumeDialog;
private boolean mShowSafetyWarning;
private DeviceCallback mDeviceCallback = new DeviceCallback();
private AudioDeviceInfo mConnectedDevice;
private final NotificationManager mNotificationManager;
@GuardedBy("mLock")
private List<AudioDeviceInfo> mConnectedDevices = new ArrayList<>();
private Object mLock = new Object();
private boolean mDestroyed;
private VolumePolicy mVolumePolicy;
@@ -1055,26 +1059,25 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
protected final class DeviceCallback extends AudioDeviceCallback {
public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
for (AudioDeviceInfo info : addedDevices) {
if (info.isSink()
&& (info.getType() == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP
|| info.getType() == AudioDeviceInfo.TYPE_BLUETOOTH_SCO)) {
mConnectedDevice = info;
mCallbacks.onConnectedDeviceChanged(info.getProductName().toString());
synchronized (mLock) {
for (AudioDeviceInfo info : addedDevices) {
if (info.isSink()
&& (info.getType() == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP
|| info.getType() == AudioDeviceInfo.TYPE_BLUETOOTH_SCO)) {
mConnectedDevices.add(info);
mCallbacks.onConnectedDeviceChanged(info.getProductName().toString());
}
}
}
}
public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
if (mConnectedDevice == null) {
mCallbacks.onConnectedDeviceChanged(null);
return;
}
for (AudioDeviceInfo info : removedDevices) {
if (info.isSink() == mConnectedDevice.isSink()
&& Objects.equals(info.getProductName(), mConnectedDevice.getProductName())
&& info.getType() == mConnectedDevice.getType()) {
mConnectedDevice = null;
synchronized (mLock) {
for (AudioDeviceInfo info : removedDevices) {
mConnectedDevices.remove(info);
}
if (mConnectedDevices.size() == 0) {
mCallbacks.onConnectedDeviceChanged(null);
}
}