summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-04 22:06:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-04 22:06:23 +0000
commitad93838c0d85eca53e92c3094d473ac38902bc12 (patch)
treec306553fa060447c488a8735e9c6d0fe6e3cfd8a
parentd88d0e785eb14d78930cde5330eeaf8566fbf0da (diff)
parentb8d46ba1fcab56f24404ce2edf270376f3c216f0 (diff)
downloadNetworkPermissionConfig-ad93838c0d85eca53e92c3094d473ac38902bc12.tar.gz
NetworkPermissionConfig: target sdk level 29 am: b8d46ba1fc
Change-Id: Ie6b8713bf04b7afa124a43c5d394a27bfe8df45a
-rw-r--r--Android.bp2
-rw-r--r--AndroidManifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index d05dcb8..7c28e70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,6 +29,8 @@ android_app {
name: "NetworkPermissionConfig",
defaults: ["NetworkPermissionConfigDefaults"],
certificate: "networkstack",
+ target_sdk_version: "29",
+ min_sdk_version: "29",
}
// Alternative stub APK signed with platform certificate. To use with InProcessNetworkStack.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 073784c..4b5ac58 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,8 +22,6 @@
android:versionCode="300000000"
android:versionName="2019-09"
>
- <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->
- <!--uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />-->
<!--
This package only exists to define the below permissions, and enforce that they are only
granted to apps sharing the same signature.