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

Bug: 131797393
Test: atest FrameworksNetTests

Merged-In: I171bd5e22b5afd5c62029392af627d7bdfe32161
(cherry picked from commit 1083b27f7c30d6ccfd8a6f4402788b4b4789ef60)

Change-Id: I23019658acfec18d342d38e8c189dcfaeb7b6f4a
---
 .../java/android/net/ip/IpClientManager.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/services/net/java/android/net/ip/IpClientManager.java b/services/net/java/android/net/ip/IpClientManager.java
index 09e333ee34714..db464e732e916 100644
--- a/services/net/java/android/net/ip/IpClientManager.java
+++ b/services/net/java/android/net/ip/IpClientManager.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
 import android.net.NattKeepalivePacketData;
 import android.net.ProxyInfo;
 import android.net.TcpKeepalivePacketData;
+import android.net.shared.Layer2Information;
 import android.net.shared.ProvisioningConfiguration;
 import android.net.util.KeepalivePacketDataUtil;
 import android.os.Binder;
@@ -292,4 +293,20 @@ public class IpClientManager {
             Binder.restoreCallingIdentity(token);
         }
     }
+
+    /**
+     * Update the bssid, L2 key and group hint layer2 information.
+     */
+    public boolean updateLayer2Information(Layer2Information info) {
+        final long token = Binder.clearCallingIdentity();
+        try {
+            mIpClient.updateLayer2Information(info.toStableParcelable());
+            return true;
+        } catch (RemoteException e) {
+            log("Error updating layer2 information", e);
+            return false;
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
 }