Merge "Don't strict GNSS measurement test" into pie-cts-dev am: 9277303cad am: 31fd37b405
am: 79f8eec5a4
Change-Id: I8ccdf3989135ee9b471d1e4dc879e7668feed337
diff --git a/tests/tests/location/src/android/location/cts/GnssTestCase.java b/tests/tests/location/src/android/location/cts/GnssTestCase.java
index a128c95..62c38c8 100644
--- a/tests/tests/location/src/android/location/cts/GnssTestCase.java
+++ b/tests/tests/location/src/android/location/cts/GnssTestCase.java
@@ -19,6 +19,7 @@
import android.os.SystemProperties;
import android.test.AndroidTestCase;
import android.util.Log;
+import android.content.pm.PackageManager;
/**
* Base Test Case class for all Gnss Tests.
@@ -37,7 +38,8 @@
// On devices using newer hardware, GNSS measurement support is required.
protected boolean isMeasurementTestStrict() {
// Enforce strict measurement test on devices with first API level at least P.
- if (SystemProperties.getInt("ro.product.first_api_level", 0) >= Build.VERSION_CODES.P) {
+ if (SystemProperties.getInt("ro.product.first_api_level", 0) >= Build.VERSION_CODES.P &&
+ !getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
return true;
}