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

Commit f72f955b authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hostapd_1_2" 

* changes:
  Freeze wifi hostapd 1.2 HAL
  IHostapd: Add hostapd 1.2
parents 2cd382b9 84c4d394

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ 
    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.wifi.hostapd</name>

        <version>1.0-1</version>

        <version>1.0-2</version>

        <interface>

            <name>IHostapd</name>

            <instance>default</instance>

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ a3eddd9bbdc87e8c22764070037dd1154f1cf006e6fba93364c4f85d4c134a19 android.hardwar 
94e803236398bed1febb11cc21051bc42ec003700139b099d6c479e02a7ca3c3 android.hardware.neuralnetworks@1.3::IPreparedModelCallback

cf1d55e8c68300090747ab90b94c22e4c859b29c84ced68a317c595bb115eab2 android.hardware.neuralnetworks@1.3::types

3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi

03d37dfebbc27b13adce1ed6389ac483bf7cf32488ca14037c5569bc3e903e4f android.hardware.wifi.hostapd@1.2::IHostapd

2defa258951e25a132aaeb36e3febe6f41bf9c6dbb1b1ebdf0b41708ab4e107e android.hardware.wifi.hostapd@1.2::types

a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardware.wifi.supplicant@1.3::ISupplicant

44445b8a03d7b9e68b2fbd954672c18a8fce9e32851b0692f4f4ab3407f86ecb android.hardware.wifi.supplicant@1.3::ISupplicantStaIface

619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

wifi/hostapd/1.2/Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.wifi.hostapd@1.2",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "IHostapd.hal",

    ],

    interfaces: [

        "android.hardware.wifi.hostapd@1.0",

        "android.hardware.wifi.hostapd@1.1",

        "android.hardware.wifi.supplicant@1.0",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}

wifi/hostapd/1.2/IHostapd.hal

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

 * Copyright 2019 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.hostapd@1.2;



import @1.1::IHostapd;

import HostapdStatus;

import MacAddress;

import Ieee80211ReasonCode;



/**

 * Top-level object for managing SoftAPs.

 */

interface IHostapd extends @1.1::IHostapd {

    /**

     * force one of the hotspot clients disconnect..

     *

     * @param ifaceName Name of the interface.

     * @param clientAddress Mac Address of the hotspot client.

     * @param reasonCode One of disconnect reason code which defined by 802.11.

     * @return status Status of the operation.

     *         Possible status codes:

     *         |HostapdStatusCode.SUCCESS|,

     *         |HostapdStatusCode.FAILURE_IFACE_UNKNOWN|

     *         |HostapdStatusCode.FAILURE_CLIENT_UNKNOWN|

     */

    forceClientDisconnect(string ifaceName, MacAddress clientAddress,

        Ieee80211ReasonCode reasonCode) generates (HostapdStatus status);

};

wifi/hostapd/1.2/types.hal

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

 * Copyright 2019 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.hostapd@1.2;



import @1.0::HostapdStatusCode;



/**

 * Enum values indicating the status of any hostapd operation.

 */

enum HostapdStatusCode : @1.0::HostapdStatusCode {

    /**

     * Failure because unknown the client.

     */

    FAILURE_CLIENT_UNKNOWN,

};



/**

 * Enum values indicating the reason code for disconnect packet.

 * Reason codes (IEEE Std 802.11-2016, 9.4.1.7, Table 9-45).

 */

enum Ieee80211ReasonCode : uint16_t {

    WLAN_REASON_UNSPECIFIED = 1,

    WLAN_REASON_PREV_AUTH_NOT_VALID = 2,

    WLAN_REASON_DISASSOC_AP_BUSY = 5,

};



typedef uint8_t[6] MacAddress;



/**

 * Generic structure to return the status of any hostapd operation.

 */

struct HostapdStatus {

    HostapdStatusCode code;



    /**

     * A vendor-specific error message to provide more information beyond the

     * status code.

     * This must be used for debugging purposes only.

     */

    string debugMessage;

};