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

Commit 2b546f3a authored by Hai Shalom's avatar Hai Shalom
Browse files

[WPA3] Move KeyMgmt capability API from StaNetwork to StaIface 

Move KeyMgmt capability API from StaNetwork to StaIface, uprev
ISupplicant and ISupplicantStaIface to v1.2.

Bug: 112195778
Test: atest SupplicantStaIfaceHalTest SupplicantStaNetworkHalTest
Change-Id: Ia249c51faca528d420180e8e569aebb0d0a022ee
parent a891b2b6

wifi/supplicant/1.2/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ hidl_interface { 
        enabled: true,

    },

    srcs: [

        "ISupplicant.hal",

        "ISupplicantStaIface.hal",

        "ISupplicantStaNetwork.hal",

    ],

    interfaces: [

wifi/supplicant/1.2/ISupplicant.hal

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

 * Copyright 2018 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.supplicant@1.2;



import @1.1::ISupplicant;



/**

 * Interface exposed by the supplicant HIDL service registered

 * with the hardware service manager.

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

 * To use 1.2 features you must cast specific interfaces returned from the

 * 1.1 HAL. For example V1_1::ISupplicant::addIface() adds V1_1::ISupplicantIface,

 * which can be cast to V1_2::ISupplicantStaIface.

 */

interface ISupplicant extends @1.1::ISupplicant {

};

wifi/supplicant/1.2/ISupplicantStaIface.hal

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

 * Copyright 2018 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.supplicant@1.2;



import @1.0::SupplicantStatus;

import @1.1::ISupplicantStaIface;

import @1.2::ISupplicantStaNetwork;



/**

 * Interface exposed by the supplicant for each station mode network

 * interface (e.g wlan0) it controls.

 */

interface ISupplicantStaIface extends @1.1::ISupplicantStaIface {



    /**

     * Get Key management capabilities of the device

     *

     * @return status Status of the operation, and a bitmap of key management mask.

     *         Possible status codes:

     *         |SupplicantStatusCode.SUCCESS|,

     *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|,

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    getKeyMgmtCapabilities()

        generates (SupplicantStatus status, bitfield<KeyMgmtMask> keyMgmtMask);

};

wifi/supplicant/1.2/ISupplicantStaNetwork.hal

+0 −13
Original line number Diff line number Diff line
@@ -256,17 +256,4 @@ interface ISupplicantStaNetwork extends @1.1::ISupplicantStaNetwork { 
     */

    setSaePasswordId(string saePasswordId)

        generates (SupplicantStatus status);



    /**

     * Get Key management capabilities of the device

     *

     * @return status Status of the operation, and a string.

     *         Possible status codes:

     *         |SupplicantStatusCode.SUCCESS|,

     *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|,

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    getKeyMgmtCapabilities()

        generates (SupplicantStatus status, bitfield<KeyMgmtMask> keyMgmtMask);

};