summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJeffrey Huang <jeffreyhuang@google.com>2021-03-23 22:16:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-23 22:16:04 +0000
commit6ea524cb37b460f2de651687a0e11e82540493bf (patch)
tree2d53c05be7f14542d9fa1caa075be86a69aec6dd /framework
parent7b34bec09f403d0a944b78d45c0b949bc30c81b1 (diff)
parent32323353d4e82131f0adade90699e8d79290ff93 (diff)
downloadStatsD-6ea524cb37b460f2de651687a0e11e82540493bf.tar.gz
Merge "Allow Statsd tests to run on R devices"
Diffstat (limited to 'framework')
-rw-r--r--framework/test/Android.bp1
-rw-r--r--framework/test/AndroidManifest.xml2
2 files changed, 3 insertions, 0 deletions
diff --git a/framework/test/Android.bp b/framework/test/Android.bp
index b8211bb0..4fa46733 100644
--- a/framework/test/Android.bp
+++ b/framework/test/Android.bp
@@ -34,4 +34,5 @@ android_test {
"device-tests",
"mts-statsd",
],
+ min_sdk_version: "30",
}
diff --git a/framework/test/AndroidManifest.xml b/framework/test/AndroidManifest.xml
index 8f89d233..bf87c57e 100644
--- a/framework/test/AndroidManifest.xml
+++ b/framework/test/AndroidManifest.xml
@@ -18,6 +18,8 @@
package="com.android.os.statsd.framework.test"
>
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.os.statsd.framework.test"