commit 4e96329bd0120ba56050dfe5876698a022d6ff79
author android-build-prod (mdb) <android-build-team-robot@google.com> Sun Nov 24 03:21:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Nov 24 03:21:11 2019 +0000
tree 5370c8dd338401effabc3cb1350fb0f97f046fce
parent 2c89975e844baa54bcf3e35faa26c238511851b6
parent 139d3d70f022605761c7ccae97e82cf7d25d246a

Merge "Snap for 6028706 from 15e4561747924ac997f1b3803c628a512382206c to android10-tests-release" into android10-tests-release

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

diff --git a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
index ed70c8a..bbaa16c 100644
--- a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
@@ -258,23 +258,28 @@
 
     private void launchVolumePanel() {
         assumeFalse("Skipping test: TV does not support handle ACTION_VOLUME", isTv());
+        assumeFalse("Skipping test: automotive does not support handle ACTION_VOLUME", isCar());
         launchPanel(Settings.Panel.ACTION_VOLUME);
     }
 
     private void launchInternetPanel() {
         assumeFalse("Skipping test: TV does not support handle ACTION_INTERNET_CONNECTIVITY",
                 isTv());
+        assumeFalse("Skipping test: automotive does not support handle ACTION_INTERNET_CONNECTIVITY",
+                isCar());
         launchPanel(Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
     }
 
     private void launchNfcPanel() {
         assumeFalse("Skipping test: TV does not support handle ACTION_NFC", isTv());
         assumeTrue("device does not support NFC", RequiredServiceRule.hasService("nfc"));
+        assumeFalse("Skipping test: automotive does not support handle ACTION_NFC", isCar());
         launchPanel(Settings.Panel.ACTION_NFC);
     }
 
     private void launchWifiPanel() {
         assumeFalse("Skipping test: TV does not support handle ACTION_WIFI", isTv());
+        assumeFalse("Skipping test: automotive does not support handle ACTION_WIFI", isCar());
         launchPanel(Settings.Panel.ACTION_WIFI);
     }
 
@@ -284,6 +289,11 @@
                 && packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
     }
 
+    private boolean isCar() {
+        PackageManager packageManager = mContext.getPackageManager();
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
     private void launchPanel(String action) {
         // Start from the home screen
         mDevice.pressHome();