Merge "Add CEC unit tests to presubmit"

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

@@ -28,6 +28,7 @@ import android.content.ContextWrapper;
 import android.media.AudioManager;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -42,6 +43,7 @@ import java.util.Collections;
 
 /** Tests for {@link ActiveSourceAction} */
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class ActiveSourceActionTest {
 

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

@@ -34,6 +34,7 @@ import android.hardware.tv.cec.V1_0.SendMessageResult;
 import android.media.AudioManager;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -50,6 +51,7 @@ import java.util.Collections;
 
 /** Tests for {@link DevicePowerStatusAction} */
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class DevicePowerStatusActionTest {
 

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

@@ -36,6 +36,7 @@ import android.hardware.hdmi.HdmiDeviceInfo;
 import android.hardware.hdmi.IHdmiControlCallback;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -52,6 +53,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class DeviceSelectActionFromPlaybackTest {
 

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

@@ -36,6 +36,7 @@ import android.hardware.hdmi.HdmiPortInfo;
 import android.hardware.hdmi.IHdmiControlCallback;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -51,6 +52,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class DeviceSelectActionFromTvTest {
 

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

@@ -39,6 +39,7 @@ import android.hardware.tv.cec.V1_0.SendMessageResult;
 import android.media.AudioManager;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -55,6 +56,7 @@ import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 /** Tests for {@link HdmiCecLocalDeviceTv} class. */
 public class HdmiCecLocalDeviceTvTest {

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

@@ -15,6 +15,8 @@
  */
 package com.android.server.hdmi;
 
+import android.platform.test.annotations.Presubmit;
+
 import androidx.test.filters.SmallTest;
 
 import com.google.common.testing.EqualsTester;
@@ -25,6 +27,7 @@ import org.junit.runners.JUnit4;
 
 /** Tests for {@link HdmiCecMessage} class. */
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class HdmiCecMessageTest {
 

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

@@ -33,6 +33,7 @@ import android.hardware.hdmi.HdmiPortInfo;
 import android.media.AudioManager;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -48,6 +49,7 @@ import java.util.concurrent.TimeUnit;
 
 /** Tests for {@link PowerStatusMonitorAction} */
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class PowerStatusMonitorActionTest {
 

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

@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -41,6 +42,7 @@ import java.util.Collections;
 import java.util.List;
 
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class RequestSadActionTest {
 

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

@@ -35,6 +35,7 @@ import android.hardware.hdmi.HdmiPortInfo;
 import android.hardware.hdmi.IHdmiControlCallback;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -51,6 +52,7 @@ import java.util.Collections;
 import java.util.List;
 
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class RoutingControlActionTest {
     /*

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

@@ -31,6 +31,7 @@ import android.hardware.hdmi.HdmiPortInfo;
 import android.media.AudioManager;
 import android.os.Looper;
 import android.os.test.TestLooper;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -47,6 +48,7 @@ import java.util.Collections;
  * Test for {@link SystemAudioAutoInitiationAction}.
  */
 @SmallTest
+@Presubmit
 @RunWith(JUnit4.class)
 public class SystemAudioAutoInitiationActionTest {