Merge "[WIFI] Make sure only a single callback is registered on IWifiChip" into pi-dev

am: c231fb2d5b

Change-Id: Iaafbb52b23217eaba4b3143a75dc8e96f47b2e77

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index f5b118795..0d73459b5 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -543,11 +543,15 @@ public class WifiVendorHal {
 
     private boolean retrieveWifiChip(IWifiIface iface) {
         synchronized (sLock) {
+            boolean registrationNeeded = mIWifiChip == null;
             mIWifiChip = mHalDeviceManager.getChip(iface);
             if (mIWifiChip == null) {
                 mLog.err("Failed to get the chip created for the Iface").flush();
                 return false;
             }
+            if (!registrationNeeded) {
+                return true;
+            }
             if (!registerChipCallback()) {
                 mLog.err("Failed to register chip callback").flush();
                 return false;