commit 809704d2af931b26517d9a312b32985c6643041e
author Gabriel Biren <gbiren@google.com> Tue Nov 07 22:06:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 07 22:06:00 2023 +0000
tree ea82931aa67dc26c4f19e17f3a00b27b51dbc412
parent 26a302a3a54d66d1055088293450e1d54dd45b6a
parent d8d6929532c406277408ca3933c8fb102d958d3b

Merge "Add helper function to check that the Hostapd HAL implements a minimum service version." into main

OWNERS

diff --git a/OWNERS b/OWNERS
index ea90cbf..4cb5c25 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 33618
 include /WIFI_OWNERS
 
 include platform/packages/modules/common:/MODULES_OWNERS  # see go/mainline-owners-policy

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index 48845e2..ab0ecee 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -99,7 +99,6 @@
     libs: [
         "androidx.annotation_annotation",
         "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
-        "framework-connectivity.stubs.module_lib",
         "app-compat-annotations",
     ],
     aidl: {
@@ -120,7 +119,10 @@
     name: "framework-wifi-pre-jarjar",
     defaults: ["framework-wifi-defaults"],
     sdk_version: "module_current",
-    libs: ["framework-annotations-lib"],
+    libs: [
+        "framework-annotations-lib",
+        "framework-connectivity.stubs.module_lib",
+    ],
     installable: false,
     visibility: [
         "//frameworks/opt/net/wifi/service",
@@ -138,7 +140,19 @@
         "framework-wifi-defaults",
     ],
 
-    stub_only_libs: ["framework-connectivity.stubs.module_lib"],
+    impl_only_libs: [
+        "framework-connectivity.stubs.module_lib",
+    ],
+
+    public: {
+        libs: ["framework-connectivity.stubs"]
+    },
+    system: {
+        libs: ["framework-connectivity.stubs.system"]
+    },
+    module_lib: {
+        libs: ["framework-connectivity.stubs.module_lib"]
+    },
 
     jarjar_rules: ":wifi-jarjar-rules",
 

framework/api/current.txt

diff --git a/framework/api/current.txt b/framework/api/current.txt
index f769b24..0047d50 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -373,6 +373,7 @@
     method @NonNull public java.util.List<android.net.wifi.MloLink> getAffiliatedMloLinks();
     method @Nullable public android.net.MacAddress getApMldMacAddress();
     method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getApMloLinkId();
+    method public long getApplicableRedactions();
     method @NonNull public java.util.List<android.net.wifi.MloLink> getAssociatedMloLinks();
     method public String getBSSID();
     method public int getCurrentSecurityType();