[WifiVendorHal] driver, firmware version getters

Test: Unit test passes
Bug: 34901572
Change-Id: I31a28965a8a57a886dc5934a285e471d3fd7c429

1 files changed, 30 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index 03f0e2361..373afe26f 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -587,24 +587,48 @@ public class WifiVendorHal {
         throw new UnsupportedOperationException();
     }
 
-    private String mDriverDescription;
+    private String mDriverDescription; // Cached value filled by requestChipDebugInfo()
 
     /**
      * Vendor-provided wifi driver version string
      */
     public String getDriverVersion() {
-        kilroy();
-        throw new UnsupportedOperationException();
+        synchronized (sLock) {
+            if (mDriverDescription == null) requestChipDebugInfo();
+            return mDriverDescription;
+        }
     }
 
-    private String mFirmwareDescription;
+    private String mFirmwareDescription; // Cached value filled by requestChipDebugInfo()
 
     /**
      * Vendor-provided wifi firmware version string
      */
     public String getFirmwareVersion() {
-        kilroy();
-        throw new UnsupportedOperationException();
+        synchronized (sLock) {
+            if (mFirmwareDescription == null) requestChipDebugInfo();
+            return mFirmwareDescription;
+        }
+    }
+
+    /**
+     * Refreshes our idea of the driver and firmware versions
+     */
+    private void requestChipDebugInfo() {
+        mDriverDescription = null;
+        mFirmwareDescription = null;
+        try {
+            if (mIWifiChip == null) return;
+            mIWifiChip.requestChipDebugInfo((status, chipDebugInfo) -> {
+                if (status.code != WifiStatusCode.SUCCESS) return;
+                mDriverDescription = chipDebugInfo.driverDescription;
+                mFirmwareDescription = chipDebugInfo.firmwareDescription;
+            });
+        } catch (RemoteException e) {
+            handleRemoteException(e);
+            return;
+        }
+        Log.e(TAG, "Driver: " + mDriverDescription + " Firmware: " + mFirmwareDescription);
     }
 
     /**