commit bb17e8bbcf44b08e642ccad5d31b70b1a9131426
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 27 16:45:02 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 16:45:02 2019 +0000
tree ef0de192940562a83b469cd0a86fb2139e7dcab0
parent f9a2ad688efdf595d5921f80a3c892b8976ac964
parent 8e8850fdc5af6214f12cebe9fba9000b44e5735f

Merge "DO NOT MERGE (these tests were removed in master: aosp/915361)" into pie-cts-dev

tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java

diff --git a/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java b/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
index 69f19b9..b94f9db 100644
--- a/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
+++ b/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
@@ -79,8 +79,9 @@
     private boolean isIntentSupported(TestcaseType testCaseType) {
         final PackageManager manager = mContext.getPackageManager();
         assertNotNull(manager);
-        // If TV then not supported.
-        if (manager.hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY)) {
+        // If TV or Automotive, then not supported.
+        if (manager.hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY) ||
+                manager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
             return false;
         }
         Intent intent;