Merge "Remove deprecated Constants from FrameworksServicesTests."

This commit is contained in:
Treehugger Robot
2020-05-04 20:07:27 +00:00
committed by Gerrit Code Review

View File

@@ -73,7 +73,6 @@ public class HdmiCecLocalDeviceAudioSystemTest {
private static final int HDMI_3_PHYSICAL_ADDRESS = 0x2300; private static final int HDMI_3_PHYSICAL_ADDRESS = 0x2300;
private int mInvokeDeviceEventState; private int mInvokeDeviceEventState;
private HdmiDeviceInfo mDeviceInfo; private HdmiDeviceInfo mDeviceInfo;
private boolean mMutingEnabled;
private boolean mArcSupport; private boolean mArcSupport;
private HdmiPortInfo[] mHdmiPortInfo; private HdmiPortInfo[] mHdmiPortInfo;
@@ -154,8 +153,6 @@ public class HdmiCecLocalDeviceAudioSystemTest {
@Override @Override
boolean readBooleanSystemProperty(String key, boolean defVal) { boolean readBooleanSystemProperty(String key, boolean defVal) {
switch (key) { switch (key) {
case Constants.PROPERTY_SYSTEM_AUDIO_MODE_MUTING_ENABLE:
return mMutingEnabled;
case Constants.PROPERTY_ARC_SUPPORT: case Constants.PROPERTY_ARC_SUPPORT:
return mArcSupport; return mArcSupport;
default: default:
@@ -209,7 +206,6 @@ public class HdmiCecLocalDeviceAudioSystemTest {
mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC); mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);
mTestLooper.dispatchAll(); mTestLooper.dispatchAll();
mNativeWrapper.clearResultMessages(); mNativeWrapper.clearResultMessages();
mMutingEnabled = true;
mArcSupport = true; mArcSupport = true;
mInvokeDeviceEventState = 0; mInvokeDeviceEventState = 0;
mDeviceInfo = null; mDeviceInfo = null;