Merge 4e1df6e83ab691d309b77b1b061e5b18e5f83603 on remote branch
Change-Id: Ia81ec835c074bc00567f76da493b724445b615ce
diff --git a/javatests/com/android/modules/utils/testing/Android.bp b/javatests/com/android/modules/utils/testing/Android.bp
index 89f7797..f7494c8 100644
--- a/javatests/com/android/modules/utils/testing/Android.bp
+++ b/javatests/com/android/modules/utils/testing/Android.bp
@@ -33,6 +33,7 @@
"androidx.test.core",
"androidx.test.runner",
"androidx.test.rules",
+ "modules-utils-build",
"platform-test-annotations",
"truth-prebuilt",
],
diff --git a/javatests/com/android/modules/utils/testing/TestableDeviceConfigTest.java b/javatests/com/android/modules/utils/testing/TestableDeviceConfigTest.java
index 3c12ea2..3273db0 100644
--- a/javatests/com/android/modules/utils/testing/TestableDeviceConfigTest.java
+++ b/javatests/com/android/modules/utils/testing/TestableDeviceConfigTest.java
@@ -20,6 +20,8 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assume.assumeTrue;
+
import android.platform.test.annotations.Presubmit;
import android.provider.DeviceConfig;
import android.provider.DeviceConfig.BadConfigException;
@@ -29,6 +31,9 @@
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
+import com.android.modules.utils.build.SdkLevel;
+
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,6 +55,11 @@
public TestableDeviceConfig.TestableDeviceConfigRule
mTestableDeviceConfig = new TestableDeviceConfig.TestableDeviceConfigRule();
+ @Before
+ public void setup() {
+ assumeTrue(SdkLevel.isAtLeastT());
+ }
+
@Test
public void getProperty_empty() {
String result = DeviceConfig.getProperty(sNamespace, sKey);