commit 7c035f32a12b27b326c096b8dba1f6296d195ec2
author Dongwon Kang <dwkang@google.com> Tue Dec 01 22:12:32 2015 -0800
committer Dongwon Kang <dwkang@google.com> Sat Dec 05 00:41:15 2015 +0000
tree f3d681491e2545a1bf260411403745a841b9e3ae
parent cc7738ed56f9086a6c0e14ae3b6654a38be633ae

TIF: Allow notifyVideoUnavailable in HardwareSessionTest

Bug: 25848429
Change-Id: I3f9f9d51ec457720e1376a77a669db0d7dbe23d6

tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java

diff --git a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
index 75cf28d..2f852d7 100644
--- a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
@@ -78,11 +78,11 @@
             return;
         }
         for (final TvInputInfo info : mPassthroughInputList) {
-            verifyCommandTuneAndHardwareVideoAvailable(info);
+            verifyCommandTuneAndHardwareVideoAvailability(info);
         }
     }
 
-    public void verifyCommandTuneAndHardwareVideoAvailable(TvInputInfo passthroughInfo) throws
+    public void verifyCommandTuneAndHardwareVideoAvailability(TvInputInfo passthroughInfo) throws
             Throwable {
         HardwareProxyTvInputService.sHardwareInputId = passthroughInfo.getId();
         Uri fakeChannelUri = TvContract.buildChannelUri(0);
@@ -93,7 +93,8 @@
             protected boolean check() {
                 CountingSession session = HardwareProxyTvInputService.sSession;
                 return session != null && session.mTuneCount > 0
-                        && session.mHardwareVideoAvailableCount > 0;
+                        && (session.mHardwareVideoAvailableCount > 0
+                                || session.mHardwareVideoUnavailableCount > 0);
             }
         }.run();
         runTestOnUiThread(new Runnable() {
@@ -119,6 +120,7 @@
         public static class CountingSession extends HardwareSession {
             public volatile int mTuneCount;
             public volatile int mHardwareVideoAvailableCount;
+            public volatile int mHardwareVideoUnavailableCount;
 
             CountingSession(Context context) {
                 super(context);
@@ -151,6 +153,11 @@
             public void onHardwareVideoAvailable() {
                 mHardwareVideoAvailableCount++;
             }
+
+            @Override
+            public void onHardwareVideoUnavailable(int reason) {
+                mHardwareVideoUnavailableCount++;
+            }
         }
     }
 }