commit 03b9344e443c3723993a05f4503d58103adcf427
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 09 23:19:47 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 09 23:19:47 2019 +0000
tree 39861d8c656240c07e26c4aec6631d962b754f95
parent 2de6751b12144b58dad75dc9a0561a3fe2d7c727
parent 90040386ffd08ec360bf2a32ed08062e555ff761

Merge "DO NOT MERGE skip MediaStoreUiTest for automotive" into pie-cts-dev

tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
index 9ed199e..9e65d0b 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
@@ -267,7 +267,8 @@
 
     private boolean supportsHardware() {
         final PackageManager pm = getInstrumentation().getContext().getPackageManager();
-        return !pm.hasSystemFeature("android.hardware.type.television")
+        return !pm.hasSystemFeature("android.hardware.type.automotive")
+                && !pm.hasSystemFeature("android.hardware.type.television")
                 && !pm.hasSystemFeature("android.hardware.type.watch");
     }