[wpa_supplicant] Upgrade ISupplicant from 1.1 to 1.2
ISupplicant must be upgraded if subclasses have been upgraded.
The version of the top-level interface is what determines what
functionality is available. The version of this top-level interface
is what gets plugged into VTS and the deprecation schedule.
Bug: 122371199
Test: atest SupplicantStaIfaceHalTest SupplicantStaNetworkHalTest
Change-Id: Ia745c3fbfc1b5ae47cbd16985a3acf6906e543f4
diff --git a/wpa_supplicant/hidl/1.2/supplicant.h b/wpa_supplicant/hidl/1.2/supplicant.h
index 02b8e06..8985854 100644
--- a/wpa_supplicant/hidl/1.2/supplicant.h
+++ b/wpa_supplicant/hidl/1.2/supplicant.h
@@ -10,11 +10,12 @@
#ifndef WPA_SUPPLICANT_HIDL_SUPPLICANT_H
#define WPA_SUPPLICANT_HIDL_SUPPLICANT_H
-#include <android-base/macros.h>
-
-#include <android/hardware/wifi/supplicant/1.1/ISupplicant.h>
#include <android/hardware/wifi/supplicant/1.0/ISupplicantCallback.h>
#include <android/hardware/wifi/supplicant/1.0/ISupplicantIface.h>
+#include <android/hardware/wifi/supplicant/1.0/types.h>
+#include <android/hardware/wifi/supplicant/1.2/ISupplicant.h>
+#include <android-base/macros.h>
+#include <hidl/Status.h>
extern "C"
{
@@ -37,7 +38,7 @@
* object is used core for global control operations on
* wpa_supplicant.
*/
-class Supplicant : public V1_1::ISupplicant
+class Supplicant : public V1_2::ISupplicant
{
public:
Supplicant(struct wpa_global* global);