commit 45d57173608fecc03ad47a94070688d22e8dcaea
author Oscar Shu <xshu@google.com> Thu Jul 14 20:37:32 2022 +0000
committer Oscar Shu <xshu@google.com> Thu Jul 14 23:16:10 2022 +0000
tree a2603ee580020df32012e8b86c17c6c7dc492baf
parent e848dd94decbe13f1afa9f6165eb573e8e1cb9e3

Hidl callback should use same V10 object

Do not use 2 separate instances of the V10 callback object, since the
V10 keeps track of states that needs to be tracked consistently across
various method calls.

Bug: 238398920
Test: atest com.android.server.wifi
Change-Id: I668375d5db33e0e812d0b8b8786e683f875890a3

service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_1Impl.java

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_1Impl.java b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_1Impl.java
index 75986d0..b5f5799 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_1Impl.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_1Impl.java
@@ -42,6 +42,10 @@
         mCallbackV10 = mStaIfaceHal.new SupplicantStaIfaceHalCallback(mIfaceName);
     }
 
+    public SupplicantStaIfaceHalHidlImpl.SupplicantStaIfaceHalCallback getCallbackV10() {
+        return mCallbackV10;
+    }
+
     @Override
     public void onNetworkAdded(int id) {
         mCallbackV10.onNetworkAdded(id);

service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_2Impl.java

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_2Impl.java b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_2Impl.java
index ef85271..73ac572 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_2Impl.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_2Impl.java
@@ -49,6 +49,10 @@
         mCallbackV11 = mStaIfaceHal.new SupplicantStaIfaceHalCallbackV1_1(mIfaceName);
     }
 
+    public SupplicantStaIfaceHalHidlImpl.SupplicantStaIfaceHalCallback getCallbackV10() {
+        return mCallbackV11.getCallbackV10();
+    }
+
     @Override
     public void onNetworkAdded(int id) {
         mCallbackV11.onNetworkAdded(id);

service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_3Impl.java

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_3Impl.java b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_3Impl.java
index f5dbcf3..0d7b175 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_3Impl.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_3Impl.java
@@ -46,6 +46,10 @@
         mCallbackV12 = mStaIfaceHal.new SupplicantStaIfaceHalCallbackV1_2(mIfaceName);
     }
 
+    public SupplicantStaIfaceHalHidlImpl.SupplicantStaIfaceHalCallback getCallbackV10() {
+        return mCallbackV12.getCallbackV10();
+    }
+
     @Override
     public void onNetworkAdded(int id) {
         mCallbackV12.onNetworkAdded(id);

service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_4Impl.java

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_4Impl.java b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_4Impl.java
index 626d66e..c70d196 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_4Impl.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackHidlV1_4Impl.java
@@ -45,7 +45,7 @@
         // Create an older callback for function delegation,
         // and it would cascadingly create older one.
         mCallbackV13 = mStaIfaceHal.new SupplicantStaIfaceHalCallbackV1_3(mIfaceName);
-        mCallbackV10 = mStaIfaceHal.new SupplicantStaIfaceHalCallback(mIfaceName);
+        mCallbackV10 = mCallbackV13.getCallbackV10();
     }
 
     @Override