Merge "Supplicant/HostapdHal: Add method to invoke terminate"

2 files changed, 32 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/HostapdHal.java b/service/java/com/android/server/wifi/HostapdHal.java
index efda54f59..e8b9b3e1c 100644
--- a/service/java/com/android/server/wifi/HostapdHal.java
+++ b/service/java/com/android/server/wifi/HostapdHal.java
@@ -356,6 +356,21 @@ public class HostapdHal {
     }
 
     /**
+     * Terminate the hostapd daemon.
+     */
+    public void terminate() {
+        synchronized (mLock) {
+            final String methodStr = "terminate";
+            if (!checkHostapdAndLogFailure(methodStr)) return;
+            try {
+                mIHostapd.terminate();
+            } catch (RemoteException e) {
+                handleRemoteException(e, methodStr);
+            }
+        }
+    }
+
+    /**
      * Wrapper functions to access static HAL methods, created to be mockable in unit tests
      */
     @VisibleForTesting
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index c8af2ad40..21c3ea18c 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -517,6 +517,23 @@ public class SupplicantStaIfaceHal {
     }
 
     /**
+     * Terminate the supplicant daemon.
+     */
+    public void terminate() {
+        synchronized (mLock) {
+            final String methodStr = "terminate";
+            if (!checkSupplicantAndLogFailure(methodStr)) return;
+            try {
+                if (isV1_1()) {
+                    getSupplicantMockableV1_1().terminate();
+                }
+            } catch (RemoteException e) {
+                handleRemoteException(e, methodStr);
+            }
+        }
+    }
+
+    /**
      * Wrapper functions to access static HAL methods, created to be mockable in unit tests
      */
     protected IServiceManager getServiceManagerMockable() throws RemoteException {