commit 8351b2e833851901f77994cbb9a5f36d1868a5b4
author Xiao Ma <xiaom@google.com> Mon Apr 06 11:24:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 06 11:24:48 2020 +0000
tree 87fb809a4736ec2bebd8066c53ceb1765de04daa
parent f7c72b1e922a66e0d643a5d729992b4fda066964
parent 1b3260c1e47203072cdb0bd9287b998825b53c83

Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: ee5606d490 am: 1b3260c1e4

Change-Id: I607629e6a6fa1cfa011bc0b7926381d35f765766

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f68cdf9..6524efe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.networkstack"
   android:sharedUserId="android.uid.networkstack"
-  android:versionCode="299900000"
+  android:versionCode="300000000"
   android:versionName="2019-09"
 >
     <!-- Permissions must be defined here, and not in the base manifest, as the network stack

common/networkstackclient/Android.bp

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 7b72e72..49e9688 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -24,6 +24,9 @@
         "src/android/net/ipmemorystore/**/*.aidl",
     ],
     backend: {
+        java: {
+            apex_available: ["com.android.wifi",],
+        },
         ndk: {
             enabled: false,
         },