Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d97cffa authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove deprecated Constants from FrameworksServicesTests." am:... 

Merge "Merge "Remove deprecated Constants from FrameworksServicesTests." am: ca8b4375 am: 2a2fad4e am: 571c707b" into rvc-d1-dev-plus-aosp
parents e863350f 0bba60db

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystemTest.java

+0 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
    private static final int HDMI_3_PHYSICAL_ADDRESS = 0x2300;

    private int mInvokeDeviceEventState;

    private HdmiDeviceInfo mDeviceInfo;

    private boolean mMutingEnabled;

    private boolean mArcSupport;

    private HdmiPortInfo[] mHdmiPortInfo;

    private boolean mWokenUp;
@@ -159,8 +158,6 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
                @Override

                boolean readBooleanSystemProperty(String key, boolean defVal) {

                    switch (key) {

                        case Constants.PROPERTY_SYSTEM_AUDIO_MODE_MUTING_ENABLE:

                            return mMutingEnabled;

                        case Constants.PROPERTY_ARC_SUPPORT:

                            return mArcSupport;

                        default:
@@ -216,7 +213,6 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        mTestLooper.dispatchAll();

        mNativeWrapper.clearResultMessages();

        mMutingEnabled = true;

        mArcSupport = true;

        mInvokeDeviceEventState = 0;

        mDeviceInfo = null;