Merge "Add a method to check whether mainline supplicant is available." into main

1 files changed, 13 insertions, 0 deletions

diff --git a/framework/java/android/net/wifi/util/Environment.java b/framework/java/android/net/wifi/util/Environment.java
index f98265845a..a20b24744d 100644
--- a/framework/java/android/net/wifi/util/Environment.java
+++ b/framework/java/android/net/wifi/util/Environment.java
@@ -46,6 +46,12 @@ public class Environment {
             new File("/apex", WIFI_APEX_NAME).getAbsolutePath();
 
     /**
+     * Path to the mainline supplicant binary.
+     */
+    private static final String MAINLINE_SUPPLICANT_BINARY_PATH =
+            WIFI_APEX_PATH + "/bin/wpa_supplicant_mainline";
+
+    /**
      * Wifi shared folder.
      */
     public static File getWifiSharedDirectory() {
@@ -69,6 +75,13 @@ public class Environment {
     }
 
     /**
+     * Returns true if the mainline supplicant binary is in the Wifi Apex.
+     */
+    public static boolean isMainlineSupplicantBinaryInWifiApex() {
+        return new File(MAINLINE_SUPPLICANT_BINARY_PATH).isFile();
+    }
+
+    /**
      * Return whether the VNDK version of the vendor partition is newer than the given API level.
      * If the property is set to non-integer value, this means the vendor partition is using
      * current API level and true is returned.