Default wake on plug to false for audio system
Changes made: 1. Audio system device no longer wakes up on hotplug (as was already done for playback devices in change https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10319601) 2. Added unit tests for 1. 3. Added unit tests for change https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10319601 Note: we should consider implementing this change in HdmiCecLocalDeviceSource instead (which is the class HdmiCecLocalDevicePlayback and HdmiCecLocalDeviceAudioSystem extend), to have a streamlined behavior for all future source classes. Test: N/A Bug: 149479986 Change-Id: I953af5ea93b609919d768fa98dce47daf62f2f06
This commit is contained in:
@@ -70,6 +70,9 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
|
||||
|
||||
private static final String TAG = "HdmiCecLocalDeviceAudioSystem";
|
||||
|
||||
private static final boolean WAKE_ON_HOTPLUG =
|
||||
SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, false);
|
||||
|
||||
// Whether the System Audio Control feature is enabled or not. True by default.
|
||||
@GuardedBy("mLock")
|
||||
private boolean mSystemAudioControlFeatureEnabled;
|
||||
@@ -318,7 +321,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
|
||||
@ServiceThreadOnly
|
||||
void onHotplug(int portId, boolean connected) {
|
||||
assertRunOnServiceThread();
|
||||
if (connected) {
|
||||
if (WAKE_ON_HOTPLUG && connected) {
|
||||
mService.wakeUp();
|
||||
}
|
||||
if (mService.getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {
|
||||
|
||||
@@ -76,6 +76,7 @@ public class HdmiCecLocalDeviceAudioSystemTest {
|
||||
private boolean mMutingEnabled;
|
||||
private boolean mArcSupport;
|
||||
private HdmiPortInfo[] mHdmiPortInfo;
|
||||
private boolean mWokenUp;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -138,7 +139,9 @@ public class HdmiCecLocalDeviceAudioSystemTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
void wakeUp() {}
|
||||
void wakeUp() {
|
||||
mWokenUp = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
void invokeDeviceEventListeners(HdmiDeviceInfo device, int status) {
|
||||
@@ -698,4 +701,18 @@ public class HdmiCecLocalDeviceAudioSystemTest {
|
||||
.getCecDeviceInfo(differentDevice.getLogicalAddress())).isEqualTo(differentDevice);
|
||||
assertThat(mInvokeDeviceEventState).isEqualTo(DEVICE_EVENT_ADD_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doNotWakeUpOnHotPlug_PlugIn() {
|
||||
mWokenUp = false;
|
||||
mHdmiCecLocalDeviceAudioSystem.onHotplug(0, true);
|
||||
assertThat(mWokenUp).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doNotWakeUpOnHotPlug_PlugOut() {
|
||||
mWokenUp = false;
|
||||
mHdmiCecLocalDeviceAudioSystem.onHotplug(0, false);
|
||||
assertThat(mWokenUp).isFalse();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +47,7 @@ public class HdmiCecLocalDevicePlaybackTest {
|
||||
private TestLooper mTestLooper = new TestLooper();
|
||||
private ArrayList<HdmiCecLocalDevice> mLocalDevices = new ArrayList<>();
|
||||
private int mPlaybackPhysicalAddress;
|
||||
private boolean mWokenUp;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -54,6 +55,7 @@ public class HdmiCecLocalDevicePlaybackTest {
|
||||
new HdmiControlService(InstrumentationRegistry.getTargetContext()) {
|
||||
@Override
|
||||
void wakeUp() {
|
||||
mWokenUp = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -135,4 +137,18 @@ public class HdmiCecLocalDevicePlaybackTest {
|
||||
assertThat(mHdmiCecLocalDevicePlayback.handleSystemAudioModeStatus(message)).isTrue();
|
||||
assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doNotWakeUpOnHotPlug_PlugIn() {
|
||||
mWokenUp = false;
|
||||
mHdmiCecLocalDevicePlayback.onHotplug(0, true);
|
||||
assertThat(mWokenUp).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doNotWakeUpOnHotPlug_PlugOut() {
|
||||
mWokenUp = false;
|
||||
mHdmiCecLocalDevicePlayback.onHotplug(0, false);
|
||||
assertThat(mWokenUp).isFalse();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user