Merge "cts: skip testUsbAccessory for emulator" into pie-cts-dev
am: 7c7b3b448d
Change-Id: Ibbfa65a9bd874228fe3e4523218c58e4e686d32e
diff --git a/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/app/src/android/app/cts/SystemFeaturesTest.java
index 40774c7..09d99a3 100644
--- a/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -43,6 +43,8 @@
import android.telephony.TelephonyManager;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.PropertyUtil;
+
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashSet;
@@ -495,6 +497,7 @@
!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION) &&
!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH) &&
!mPackageManager.hasSystemFeature(PackageManager.FEATURE_EMBEDDED) &&
+ !isAndroidEmulator() &&
!mPackageManager.hasSystemFeature(PackageManager.FEATURE_PC)) {
// USB accessory mode is only a requirement for devices with USB ports supporting
// peripheral mode. As there is no public API to distinguish a device with only host
@@ -543,6 +546,10 @@
}
}
+ private boolean isAndroidEmulator() {
+ return PropertyUtil.propertyEquals("ro.kernel.qemu", "1");
+ }
+
private void assertFeature(boolean exist, String feature) {
if (exist) {
assertAvailable(feature);