Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a3a84f5 authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi(hidl): Add supplicant HIDL interface 

Convert the existing AIDL binder interface of wpa_supplicant to HIDL.

Summary of changes:
1. Every HIDL method returns an instance of |SupplicantStatus|
along with any others params (for getters). This is needed to return the
equivalent of |Binder::Status| to indicate errors in the args passed,
stale proxy, etc.
2. All constants are changed to enums. There were some constants which
should have been enums in the first place, but wasn't because AIDL did
not support enums. But, there are others which should be standalone
constants, but are enums now because constants are not supported in HIDL.
3. Conform to HIDL style guide.

Bug: 31365276
Test: `mmm -j32 hardware/interfaces/wifi/1.0/`
Change-Id: Iba753e279fd260788d8628ea2f5c2281b5844095
parent e168ebab

wifi/1.0/Android.mk

+428 −0
Original line number Diff line number Diff line
@@ -25,6 +25,126 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicant.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicant



$(GEN): $(LOCAL_PATH)/ISupplicant.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantCallback



$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantIfaceAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIface



$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantIfaceCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantNetworkAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantNetworkCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Lc++ -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifi.hal

#
@@ -159,6 +279,160 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatus)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::types.SupplicantStatus



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatusCode)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatusCode.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::types.SupplicantStatusCode



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicant.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicant.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicant



$(GEN): $(LOCAL_PATH)/ISupplicant.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantCallback



$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIface.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIface



$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifi.hal

#
@@ -285,6 +559,160 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatus)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::types.SupplicantStatus



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatusCode)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatusCode.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::types.SupplicantStatusCode



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicant.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicant.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicant



$(GEN): $(LOCAL_PATH)/ISupplicant.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantCallback



$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIface.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIface



$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.wifi@1.0::ISupplicantNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifi.hal

#

wifi/1.0/ISupplicant.hal

0 → 100644
+155 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.wifi@1.0;



import ISupplicantCallback;

import ISupplicantIface;



/**

 * Interface exposed by the wpa_supplicant HIDL service registered

 * with the hardware service manager.

 * This is the root level object for any wpa_supplicant interactions.

 */

interface ISupplicant {

  /**

   * Debug levels for wpa_supplicant.

   * Only log messages with a level greater than the set level

   * (via |setDebugParams|) will be logged.

   */

  enum DebugLevel : uint32_t {

    EXCESSIVE = 0,

    MSGDUMP = 1,

    DEBUG = 2,

    INFO = 3,

    WARNING = 4,

    ERROR = 5

  };



  /**

   * Registers a wireless interface in wpa_supplicant.

   *

   * @param ifName Name of the network interface, e.g., wlan0

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

   *         |SupplicantStatusCode.FAILURE_IFACE_EXISTS|

   * @return iface HIDL interface object representing the interface if

   *         successful, null otherwise.

   */

  createInterface(string ifName)

      generates (SupplicantStatus status, ISupplicantIface iface);



  /**

   * Deregisters a wireless interface from wpa_supplicant.

   *

   * @param ifName Name of the network interface, e.g., wlan0

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

   *         |SupplicantStatusCode.FAILURE_IFACE_UNKOWN|

   */

  removeInterface(string ifName) generates (SupplicantStatus status);



  /**

   * Gets a HIDL interface object for the interface corresponding to ifName

   * which wpa_supplicant already controls.

   *

   * @param ifName Name of the network interface, e.g., wlan0

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

   *         |SupplicantStatusCode.FAILURE_IFACE_UNKOWN|

   * @return iface HIDL interface object representing the interface if

   *         successful, null otherwise.

   */

  getInterface(string ifName)

      generates (SupplicantStatus status, ISupplicantIface iface);



  /**

   * Retrieve a list of all the interface names controlled by wpa_supplicant.

   *

   * The corresponding |ISupplicantIface| object for any interface can be

   * retrieved using |getInterface| method.

   *

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|

   * @return ifNames List of all interface names controlled by wpa_supplicant.

   */

  listInterfaces() generates (SupplicantStatus status, vec<string> ifNames);



  /**

   * Register for callbacks from the wpa_supplicant service.

   *

   * These callbacks are invoked for global events that are not specific

   * to any interface or network. Registration of multiple callback

   * objects is supported. These objects must be deleted when the corresponding

   * client process is dead.

   *

   * @param callback An instance of the |ISupplicantCallback| HIDL interface

   *        object.

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|

   */

  registerCallback(ISupplicantCallback callback)

      generates (SupplicantStatus status);



  /**

   * Set debug parameters for wpa_supplicant.

   *

   * @param level Debug logging level for wpa_supplicant.

   *        (one of |DebugLevel| values).

   * @param timestamp Determines whether to show timestamps in logs or

   *        not.

   * @param showKeys Determines whether to show keys in debug logs or

   *        not.

   *        CAUTION: Do not set this param in production code!

   * @return status Status of the operation.

   *         Possible status codes:

   *         |SupplicantStatusCode.SUCCESS|,

   *         |SupplicantStatusCode.FAILURE_UNKNOWN|

   */

  setDebugParams(DebugLevel level, bool showTimestamp, bool showKeys)

      generates (SupplicantStatus status);



  /**

   * Get the debug level set.

   *

   * @return level one of |DebugLevel| values.

   */

  getDebugLevel() generates (DebugLevel level);



  /**

   * Get whether the timestamps are shown in the debug logs or not.

   *

   * @return enabled true if set, false otherwise.

   */

  isDebugShowTimestampEnabled() generates (bool enabled);



  /**

   * Get whether the keys are shown in the debug logs or not.

   *

   * @return enabled true if set, false otherwise.

   */

  isDebugShowKeysEnabled() generates (bool enabled);

};

wifi/1.0/ISupplicantCallback.hal

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.wifi@1.0;



/**

 * Callback Interface exposed by the wpa_supplicant service (ISupplicant).

 *

 * Clients need to host an instance of this HIDL interface object and

 * pass a reference of the object to wpa_supplicant via the

 * |ISupplicant.registerCallback| method.

 */

interface ISupplicantCallback {

  /**

   * Used to indicate that a new interface has been created.

   *

   * @param ifName Name of the network interface, e.g., wlan0

   */

  oneway onInterfaceCreated(string ifName);



  /**

   * Used to indicate that an interface has been removed.

   *

   * @param ifName Name of the network interface, e.g., wlan0

   */

  oneway onInterfaceRemoved(string ifName);

};