commit 3168e392320087c51a677b4d14e783c853ac652d
author Xiao Ma <xiaom@google.com> Tue Mar 31 15:39:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 31 15:39:52 2020 +0000
tree 4f5e476aae33d66cabeedd475ab17e7cb6e02f82
parent f245a6c645dd9542d47e74d961db75d1a8e2528a
parent b652d668bc5281d03cf5b8eaebcfb24a57955f68

Merge "Add new method to update Layer2 information when L2 roaming happens." am: b844596d02 am: b652d668bc

Change-Id: I85eabccb6f5d5f322c8e3df556ceef6647616f5a

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 ac8fda7..9081af4 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,
         },