Use SystemProperties to get first_api_level
- In Instant-CTS, PropertyUtil#getFirstApiLevel() returns SDK_INT
instead of first_api_level.
Bug: 118833476
Change-Id: I146408065756e12de349d364937c9d95c7edb2fe
Fixes: 118833476
Test: run cts-instant -m CtsLocationTestCases -t android.location.cts.GnssMeasurementRegistrationTest#testGnssMeasurementRegistration
diff --git a/tests/tests/location/src/android/location/cts/GnssTestCase.java b/tests/tests/location/src/android/location/cts/GnssTestCase.java
index e1c5e88..a128c95 100644
--- a/tests/tests/location/src/android/location/cts/GnssTestCase.java
+++ b/tests/tests/location/src/android/location/cts/GnssTestCase.java
@@ -16,11 +16,10 @@
package android.location.cts;
import android.os.Build;
+import android.os.SystemProperties;
import android.test.AndroidTestCase;
import android.util.Log;
-import com.android.compatibility.common.util.PropertyUtil;
-
/**
* Base Test Case class for all Gnss Tests.
*/
@@ -38,7 +37,7 @@
// 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 (PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.P) {
+ if (SystemProperties.getInt("ro.product.first_api_level", 0) >= Build.VERSION_CODES.P) {
return true;
}
@@ -53,4 +52,4 @@
public boolean isCtsVerifierTest() {
return mCtsVerifierTest;
}
-}
\ No newline at end of file
+}