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

Commit fd5aca93 authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

Migration of IRadioConfig 1.1 types to 1.2. 

To better test CBRS, we want IRadio 1.1 to be Android P plus CBRS
HAL interfaces, while 1.2 will be 1.1 plus all other Android Q
interfaces. So we are creating V1_2 folder and moving everything
currently defined in android.hardware.radio.config.V1_1 there.

Bug: 117805040
Test: build and telephony unittest
Change-Id: Ia221258b62351d1190e78fa0e5faafc36163f4a9
Merged-In: Ia221258b62351d1190e78fa0e5faafc36163f4a9
parent f168f0b3

radio/config/1.1/Android.bp

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

    },

    srcs: [

        "types.hal",

        "IRadioConfigIndication.hal",

        "IRadioConfigResponse.hal",

    ],
@@ -16,8 +15,5 @@ hidl_interface { 
        "android.hardware.radio.config@1.0",

        "android.hidl.base@1.0",

    ],

    types: [

        "SimSlotStatus",

    ],

    gen_java: true,

}

radio/config/1.1/IRadioConfigIndication.hal

+0 −14
Original line number Diff line number Diff line
@@ -17,23 +17,9 @@ 
package android.hardware.radio.config@1.1;



import @1.0::IRadioConfigIndication;

import android.hardware.radio@1.0::RadioIndicationType;



/**

 * Interface declaring unsolicited radio config indications.

 */

interface IRadioConfigIndication extends @1.0::IRadioConfigIndication {



    /**

     * Indicates SIM slot status change.

     *

     * This indication must be sent by the modem whenever there is any slot status change, even the

     * slot is inactive. For example, this indication must be triggered if a SIM card is inserted

     * into an inactive slot.

     *

     * @param type Type of radio indication

     * @param slotStatus new slot status info with size equals to the number of physical slots on

     *        the device

     */

    oneway simSlotsStatusChanged_1_1(RadioIndicationType type, vec<SimSlotStatus> slotStatus);

};

radio/config/1.1/IRadioConfigResponse.hal

+0 −16
Original line number Diff line number Diff line
@@ -16,26 +16,10 @@ 


package android.hardware.radio.config@1.1;



import android.hardware.radio@1.0::RadioResponseInfo;

import @1.0::IRadioConfigResponse;

import @1.1::SimSlotStatus;



/**

 * Interface declaring response functions to solicited radio config requests.

 */

interface IRadioConfigResponse extends @1.0::IRadioConfigResponse {



    /**

     * @param info Response info struct containing response type, serial no. and error

     * @param slotStatus Sim slot struct containing all the physical SIM slots info with size

     *        equal to the number of physical slots on the device

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:NO_MEMORY

     *   RadioError:INTERNAL_ERR

     *   RadioError:MODEM_ERR

     */

    oneway getSimSlotsStatusResponse_1_1(RadioResponseInfo info, vec<SimSlotStatus> slotStatus);

};

radio/config/1.2/Android.bp

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



hidl_interface {

    name: "android.hardware.radio.config@1.2",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "IRadioConfigIndication.hal",

        "IRadioConfigResponse.hal",

    ],

    interfaces: [

        "android.hardware.radio@1.0",

        "android.hardware.radio.config@1.0",

        "android.hardware.radio.config@1.1",

        "android.hidl.base@1.0",

    ],

    types: [

        "SimSlotStatus",

    ],

    gen_java: true,

}

radio/config/1.2/IRadioConfigIndication.hal

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

 * Copyright (C) 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.radio.config@1.2;



import android.hardware.radio@1.0::RadioIndicationType;

import @1.1::IRadioConfigIndication;



/**

 * Interface declaring unsolicited radio config indications.

 */

interface IRadioConfigIndication extends @1.1::IRadioConfigIndication {



    /**

     * Indicates SIM slot status change.

     *

     * This indication must be sent by the modem whenever there is any slot status change, even the

     * slot is inactive. For example, this indication must be triggered if a SIM card is inserted

     * into an inactive slot.

     *

     * @param type Type of radio indication

     * @param slotStatus new slot status info with size equals to the number of physical slots on

     *        the device

     */

    oneway simSlotsStatusChanged_1_2(RadioIndicationType type, vec<SimSlotStatus> slotStatus);

};
 
 No newline at end of file