From ef0aa6f9e5718942a93c69bbe6be21bf6c0fa532 Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Tue, 31 Mar 2020 15:39:52 +0000
Subject: Add new method to update Layer2 information when L2 roaming happens.

This change adds an new method updateLayer2Information in IIpClient.aidl
to update layer2 info (e.g. bssid, l2key and grouphint) to detect
whether L2 roaming happens or not.

Bug: 131797393
Test: atest NetworkStackTests FrameworksNetTests

Merged-In: I85eabccb6f5d5f322c8e3df556ceef6647616f5a
(cherry picked from commit 3168e392320087c51a677b4d14e783c853ac652d)

Change-Id: Ife93fd162803ae89fa85905b45a4bb1cfb5e7e43
---
 src/android/net/ip/IpClient.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/android/net/ip/IpClient.java')

diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index ebb31c6..bb5565d 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -28,6 +28,7 @@ import android.net.ConnectivityManager;
 import android.net.DhcpResults;
 import android.net.INetd;
 import android.net.IpPrefix;
+import android.net.Layer2InformationParcelable;
 import android.net.Layer2PacketParcelable;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
@@ -704,6 +705,12 @@ public class IpClient extends StateMachine {
             IpClient.this.notifyPreconnectionComplete(success);
         }
 
+        @Override
+        public void updateLayer2Information(Layer2InformationParcelable info) {
+            enforceNetworkStackCallingPermission();
+            IpClient.this.updateLayer2Information(info);
+        }
+
         @Override
         public int getInterfaceVersion() {
             return this.VERSION;
@@ -877,6 +884,13 @@ public class IpClient extends StateMachine {
         sendMessage(CMD_COMPLETE_PRECONNECTION, success ? 1 : 0);
     }
 
+    /**
+     * Update the network bssid, L2Key and GroupHint layer2 information.
+     */
+    public void updateLayer2Information(@NonNull Layer2InformationParcelable info) {
+        // TODO: add specific implementation.
+    }
+
     /**
      * Dump logs of this IpClient.
      */
-- 
cgit v1.2.3