diff --git a/display/config/1.1/Android.bp b/display/config/1.1/Android.bp
new file mode 100644
index 0000000..d0ba1d4
--- /dev/null
+++ b/display/config/1.1/Android.bp
@@ -0,0 +1,90 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+    name: "vendor.display.config@1.1_hal",
+    srcs: [
+        "IDisplayConfig.hal",
+    ],
+}
+
+genrule {
+    name: "vendor.display.config@1.1_genc++",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.1",
+    srcs: [
+        ":vendor.display.config@1.1_hal",
+    ],
+    out: [
+        "vendor/display/config/1.1/DisplayConfigAll.cpp",
+    ],
+}
+
+genrule {
+    name: "vendor.display.config@1.1_genc++_headers",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.1",
+    srcs: [
+        ":vendor.display.config@1.1_hal",
+    ],
+    out: [
+        "vendor/display/config/1.1/IDisplayConfig.h",
+        "vendor/display/config/1.1/IHwDisplayConfig.h",
+        "vendor/display/config/1.1/BnHwDisplayConfig.h",
+        "vendor/display/config/1.1/BpHwDisplayConfig.h",
+        "vendor/display/config/1.1/BsDisplayConfig.h",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.display.config@1.1",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.display.config@1.1_genc++"],
+    generated_headers: ["vendor.display.config@1.1_genc++_headers"],
+    export_generated_headers: ["vendor.display.config@1.1_genc++_headers"],
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hidl.base@1.0",
+        "vendor.display.config@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hidl.base@1.0",
+        "vendor.display.config@1.0",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.display.config@1.1_vendor",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.display.config@1.1_genc++"],
+    generated_headers: ["vendor.display.config@1.1_genc++_headers"],
+    export_generated_headers: ["vendor.display.config@1.1_genc++_headers"],
+    vendor: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hidl.base@1.0",
+        "vendor.display.config@1.0_vendor",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hidl.base@1.0",
+        "vendor.display.config@1.0_vendor",
+    ],
+}
diff --git a/display/config/1.1/IDisplayConfig.hal b/display/config/1.1/IDisplayConfig.hal
new file mode 100644
index 0000000..d6987bd
--- /dev/null
+++ b/display/config/1.1/IDisplayConfig.hal
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2017 The Linux Foundation. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*    * Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*    * Redistributions in binary form must reproduce the above
+*      copyright notice, this list of conditions and the following
+*      disclaimer in the documentation and/or other materials provided
+*      with the distribution.
+*    * Neither the name of The Linux Foundation. nor the names of its
+*      contributors may be used to endorse or promote products derived
+*      from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package vendor.display.config@1.1;
+
+import @1.0::IDisplayConfig;
+
+interface IDisplayConfig extends @1.0::IDisplayConfig {
+  /*
+  * Set display animating property.
+  *
+  * @return one of the hwc2 errors
+  */
+  @callflow(next="*")
+  setDisplayAnimating(uint64_t displayId, bool animating) generates (int32_t error);
+};
+
diff --git a/display/config/Android.bp b/display/config/Android.bp
index 36d9b01..8926b48 100644
--- a/display/config/Android.bp
+++ b/display/config/Android.bp
@@ -1,4 +1,5 @@
 // This is an autogenerated file, do not edit.
 subdirs = [
     "1.0",
-]
\ No newline at end of file
+    "1.1",
+]
diff --git a/wifi/Android.bp b/wifi/Android.bp
new file mode 100644
index 0000000..7aef46b
--- /dev/null
+++ b/wifi/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+    "*"
+]
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
new file mode 100644
index 0000000..e2af8e8
--- /dev/null
+++ b/wifi/supplicant/1.0/Android.bp
@@ -0,0 +1,100 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+    name: "vendor.qti.hardware.wifi.supplicant@1.0_hal",
+    srcs: [
+        "ISupplicantVendorStaIface.hal",
+        "ISupplicantVendorStaIfaceCallback.hal",
+        "ISupplicantVendorStaNetwork.hal",
+    ],
+}
+
+genrule {
+    name: "vendor.qti.hardware.wifi.supplicant@1.0_genc++",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.wifi.supplicant@1.0",
+    srcs: [
+        ":vendor.qti.hardware.wifi.supplicant@1.0_hal",
+    ],
+    out: [
+        "vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaIfaceAll.cpp",
+        "vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaIfaceCallbackAll.cpp",
+        "vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaNetworkAll.cpp",
+    ],
+}
+
+genrule {
+    name: "vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.wifi.supplicant@1.0",
+    srcs: [
+        ":vendor.qti.hardware.wifi.supplicant@1.0_hal",
+    ],
+    out: [
+        "vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaIface.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaIface.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaIface.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaIface.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaIface.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaIfaceCallback.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaIfaceCallback.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaIfaceCallback.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaIfaceCallback.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaIfaceCallback.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaNetwork.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaNetwork.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaNetwork.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaNetwork.h",
+        "vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaNetwork.h",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.wifi.supplicant@1.0",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++"],
+    generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
+    export_generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hardware.wifi.supplicant@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hardware.wifi.supplicant@1.0",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.qti.hardware.wifi.supplicant@1.0_vendor",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++"],
+    generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
+    export_generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
+    vendor: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hardware.wifi.supplicant@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hardware.wifi.supplicant@1.0",
+    ],
+}
diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk
new file mode 100644
index 0000000..5b0144d
--- /dev/null
+++ b/wifi/supplicant/1.0/Android.mk
@@ -0,0 +1,164 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vendor.qti.hardware.wifi.supplicant-V1.0-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+    android.hardware.wifi.supplicant-V1.0-java \
+    android.hidl.base-V1.0-java \
+
+
+#
+# Build ISupplicantVendorStaIface.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaIface.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaIface.hal
+$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaIface
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIface.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISupplicantVendorStaIfaceCallback.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaIfaceCallback.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaIfaceCallback
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISupplicantVendorStaNetwork.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaNetwork.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaNetwork.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaNetwork
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaNetwork.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vendor.qti.hardware.wifi.supplicant-V1.0-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android.hardware.wifi.supplicant-V1.0-java-static \
+    android.hidl.base-V1.0-java-static \
+
+
+#
+# Build ISupplicantVendorStaIface.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaIface.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaIface.hal
+$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaIface
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIface.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISupplicantVendorStaIfaceCallback.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaIfaceCallback.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaIfaceCallback
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaIfaceCallback.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISupplicantVendorStaNetwork.hal
+#
+GEN := $(intermediates)/vendor/qti/hardware/wifi/supplicant/V1_0/ISupplicantVendorStaNetwork.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantVendorStaNetwork.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.qti.hardware:vendor/qcom/opensource/interfaces \
+        vendor.qti.hardware.wifi.supplicant@1.0::ISupplicantVendorStaNetwork
+
+$(GEN): $(LOCAL_PATH)/ISupplicantVendorStaNetwork.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/wifi/supplicant/1.0/ISupplicantVendorStaIface.hal b/wifi/supplicant/1.0/ISupplicantVendorStaIface.hal
new file mode 100644
index 0000000..f32da29
--- /dev/null
+++ b/wifi/supplicant/1.0/ISupplicantVendorStaIface.hal
@@ -0,0 +1,67 @@
+/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above
+*       copyright notice, this list of conditions and the following
+*       disclaimer in the documentation and/or other materials provided
+*       with the distribution.
+*     * Neither the name of The Linux Foundation nor the names of its
+*       contributors may be used to endorse or promote products derived
+*       from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+package vendor.qti.hardware.wifi.supplicant@1.0;
+
+import android.hardware.wifi.supplicant@1.0::ISupplicantStaIface;
+import android.hardware.wifi.supplicant@1.0::types;
+
+/**
+ * Vendor StaIface Interface extend to wifi.Supplicant@1.0 ISupplicantStaIface
+ */
+interface ISupplicantVendorStaIface extends ISupplicantStaIface {
+  /**
+   * Flush FILS HLP IEs
+   * Use this to flush all the HLP IEs in wpa_supplicant
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|,
+   *         |SupplicantStatusCode.FAILURE_IFACE_DISABLED|
+   */
+  filsHlpFlushRequest() generates (SupplicantStatus status);
+
+  /**
+   * Add FILS HLP IEs
+   * Use this to add a HLP IE to wpa_supplicant
+   *
+   * @param dst_mac MAC address of the destination
+   * @param pkt The contents of the HLP IE starting from ethertype
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|,
+   *         |SupplicantStatusCode.FAILURE_IFACE_DISABLED|
+   */
+  filsHlpAddRequest(MacAddress dst_mac, vec<uint8_t> pkt)
+      generates (SupplicantStatus status);
+};
diff --git a/wifi/supplicant/1.0/ISupplicantVendorStaIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantVendorStaIfaceCallback.hal
new file mode 100644
index 0000000..a2f1f01
--- /dev/null
+++ b/wifi/supplicant/1.0/ISupplicantVendorStaIfaceCallback.hal
@@ -0,0 +1,62 @@
+/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above
+*       copyright notice, this list of conditions and the following
+*       disclaimer in the documentation and/or other materials provided
+*       with the distribution.
+*     * Neither the name of The Linux Foundation nor the names of its
+*       contributors may be used to endorse or promote products derived
+*       from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+package vendor.qti.hardware.wifi.supplicant@1.0;
+
+import android.hardware.wifi.supplicant@1.0::ISupplicantStaIfaceCallback;
+import android.hardware.wifi.supplicant@1.0::types;
+
+/**
+ * Vendor StaIface Callback Interface extend to wifi.Supplicant@1.0
+ * ISupplicantStaIfaceCallback
+ */
+interface ISupplicantVendorStaIfaceCallback
+    extends ISupplicantStaIfaceCallback {
+  /**
+   * Used to indicate a state change event on this particular iface. If this
+   * event is triggered by a particular network, the |SupplicantNetworkId|,
+   * |ssid|, |bssid| parameters must indicate the parameters of the network/AP
+   * which caused this state transition.
+   *
+   * @param newState New State of the interface. This must be one of the |State|
+   *        values above.
+   * @param bssid BSSID of the corresponding AP which caused this state
+   *        change event. This must be zero'ed if this event is not
+   *        specific to a particular network.
+   * @param id ID of the corresponding network which caused this
+   *        state change event. This must be invalid (UINT32_MAX) if this
+   *        event is not specific to a particular network.
+   * @param ssid SSID of the corresponding network which caused this state
+   *        change event. This must be empty if this event is not specific
+   *        to a particular network.
+   * @param filsHlpSent If FILS HLP IEs were included in this association.
+   */
+  oneway onVendorStateChanged(
+      State newState, Bssid bssid, SupplicantNetworkId id, Ssid ssid, bool filsHlpSent);
+};
diff --git a/wifi/supplicant/1.0/ISupplicantVendorStaNetwork.hal b/wifi/supplicant/1.0/ISupplicantVendorStaNetwork.hal
new file mode 100644
index 0000000..cc577ce
--- /dev/null
+++ b/wifi/supplicant/1.0/ISupplicantVendorStaNetwork.hal
@@ -0,0 +1,70 @@
+/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above
+*       copyright notice, this list of conditions and the following
+*       disclaimer in the documentation and/or other materials provided
+*       with the distribution.
+*     * Neither the name of The Linux Foundation nor the names of its
+*       contributors may be used to endorse or promote products derived
+*       from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+package vendor.qti.hardware.wifi.supplicant@1.0;
+
+
+import android.hardware.wifi.supplicant@1.0::ISupplicantNetwork;
+import android.hardware.wifi.supplicant@1.0::ISupplicantStaNetworkCallback;
+import android.hardware.wifi.supplicant@1.0::ISupplicantStaNetwork;
+import android.hardware.wifi.supplicant@1.0::types;
+
+
+/**
+ * Vendor StaNetwork Interface extend to wifi.Supplicant@1.0 ISupplicantStaNetwork
+ */
+interface ISupplicantVendorStaNetwork extends ISupplicantStaNetwork {
+  /** Possble mask of values for VendorKeyMgmt param. */
+  enum VendorKeyMgmtMask : uint32_t {
+    FILS_SHA256 = 1 << 18,
+    FILS_SHA384 = 1 << 19,
+  };
+
+  /** Possble mask of values for VendorAuthAlg param. */
+  enum VendorAuthAlgMask : uint32_t {
+    FILS_SK = 1 << 5,
+  };
+
+  /**
+   * Enable EAP ERP for this network.
+   *
+   * @param enable true to set, false otherwise.
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   */
+  setEapErp(bool enable) generates (SupplicantStatus status);
+
+  /**
+   * Configure Sim number for eap-proxy
+   */
+  setSimNumber(uint32_t sim_num) generates (SupplicantStatus status);
+};
diff --git a/wifi/supplicant/Android.bp b/wifi/supplicant/Android.bp
new file mode 100644
index 0000000..e5682f5
--- /dev/null
+++ b/wifi/supplicant/Android.bp
@@ -0,0 +1,4 @@
+subdirs = [
+    "1.0"
+]
+