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

Commit 2682ae42 authored by Mingming Cai's avatar Mingming Cai Committed by Gerrit Code Review
Browse files

Merge "Update Hal 1.6 for updated SignalStength"

parents c8bf0854 20a2f420

radio/1.6/IRadio.hal

+9 −0
Original line number Diff line number Diff line
@@ -389,6 +389,15 @@ interface IRadio extends @1.5::IRadio { 
     */

    oneway getVoiceRegistrationState_1_6(int32_t serial);



    /**

     * Requests current signal strength and associated information.  Must succeed if radio is on.

     *

     * @param serial Serial number of request.

     *

     * Response function is IRadioResponse.getSignalStrengthResponse_1_6()

     */

    oneway getSignalStrength_1_6(int32_t serial);



    /**

     * Request current data registration state.

     *

radio/1.6/IRadioIndication.hal

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import @1.5::IRadioIndication; 
import @1.6::CellInfo;

import @1.6::LinkCapacityEstimate;

import @1.6::NetworkScanResult;

import @1.6::SignalStrength;

import @1.6::SetupDataCallResult;



/**
@@ -70,6 +71,18 @@ interface IRadioIndication extends @1.5::IRadioIndication { 
     */

    oneway currentLinkCapacityEstimate_1_6(RadioIndicationType type, LinkCapacityEstimate lce);





    /**

     * Indicates current signal strength of the radio.

     *

     * This is identical to currentSignalStrength_1_4 but uses an updated version of

     * SignalStrength.

     *

     * @param type Type of radio indication

     * @param signalStrength SignalStrength information

     */

    oneway currentSignalStrength_1_6(RadioIndicationType type, SignalStrength signalStrength);



    /**

     * Report all of the current cell information known to the radio.

     *

radio/1.6/IRadioResponse.hal

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import @1.6::CellInfo; 
import @1.6::RegStateResult;

import @1.6::RadioResponseInfo;

import @1.6::SetupDataCallResult;

import @1.6::SignalStrength;



/**

 * Interface declaring response functions to solicited radio requests.
@@ -343,6 +344,19 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     */

    oneway getCellInfoListResponse_1_6(RadioResponseInfo info, vec<CellInfo> cellInfo);



    /**

     * This is identical to getSignalStrengthResponse_1_4 but uses an updated version of

     * SignalStrength.

     *

     * @param signalStrength Current signal strength

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     */

    oneway getSignalStrengthResponse_1_6(RadioResponseInfo info, SignalStrength signalStrength);



    /**

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

     * @param voiceRegResponse Current Voice registration response as defined by RegStateResult

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+8 −0
Original line number Diff line number Diff line
@@ -799,6 +799,10 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon 
    Return<void> getSystemSelectionChannelsResponse(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);



    Return<void> getSignalStrengthResponse_1_6(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

            const ::android::hardware::radio::V1_6::SignalStrength& sig_strength);



    Return<void> getCellInfoListResponse_1_6(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_6::CellInfo>&
@@ -830,6 +834,10 @@ class RadioIndication_v1_6 : public ::android::hardware::radio::V1_6::IRadioIndi 
    Return<void> unthrottleApn(RadioIndicationType type,

                               const ::android::hardware::hidl_string& apn);



    Return<void> currentSignalStrength_1_6(

            RadioIndicationType type,

            const ::android::hardware::radio::V1_6::SignalStrength& signalStrength);



    Return<void> networkScanResult_1_6(

            RadioIndicationType type,

            const ::android::hardware::radio::V1_6::NetworkScanResult& result);

radio/1.6/vts/functional/radio_indication.cpp

+6 −0
Original line number Diff line number Diff line
@@ -387,6 +387,12 @@ Return<void> RadioIndication_v1_6::modemReset(RadioIndicationType /*type*/, 
    return Void();

}



Return<void> RadioIndication_v1_6::currentSignalStrength_1_6(

        RadioIndicationType /*type*/,

        const ::android::hardware::radio::V1_6::SignalStrength& /*signalStrength*/) {

    return Void();

}



Return<void> RadioIndication_v1_6::networkScanResult_1_6(

        RadioIndicationType /*type*/,

        const ::android::hardware::radio::V1_6::NetworkScanResult& /*result*/) {