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

Commit 4c673e10 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Provide secondary link capacity estimation am: 43e5220d 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1490699

Change-Id: Ia6a98233666c73eff622253b1b3d124718219662
parents 62b01262 43e5220d

radio/1.6/IRadioIndication.hal

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.radio@1.6; 


import @1.0::RadioIndicationType;

import @1.5::IRadioIndication;

import @1.6::SetupDataCallResult;

import @1.6::LinkCapacityEstimate;



/**

 * Interface declaring unsolicited radio indications.
@@ -53,4 +55,16 @@ interface IRadioIndication extends @1.5::IRadioIndication { 
     * @param apn Apn to unthrottle

     */

    oneway unthrottleApn(RadioIndicationType type, string apn);



    /**

     * Indicates current link capacity estimate.

     * This replaces @1.2::IRadioIndication.currentLinkCapacityEstimate().

     * This indication is sent whenever the reporting criteria, as set by

     * @1.2::IRadio.setLinkCapacityReportingCriteria, are met and the indication is not

     * suppressed by @1.2::IRadio.setIndicationFilter_1_2().

     *

     * @param type Type of radio indication

     * @param lce LinkCapacityEstimate

     */

    oneway currentLinkCapacityEstimate_1_6(RadioIndicationType type, LinkCapacityEstimate lce);

};

radio/1.6/types.hal

+44 −0
Original line number Diff line number Diff line
@@ -284,3 +284,47 @@ enum NrDualConnectivityState: int32_t { 
     */

    DISABLE_IMMEDIATE= 3,

};



/**

 * Overwritten from @1.2::LinkCapacityEstimate to update LinkCapacityEstimate to 1.6 version.

 */

struct LinkCapacityEstimate {



   /**

    * Estimated downlink capacity in kbps. In case of a dual connected network,

    * this includes capacity of both primary and secondary. This bandwidth estimate shall be

    * the estimated maximum sustainable link bandwidth (as would be measured

    * at the Upper PDCP or SNDCP SAP). If the DL Aggregate Maximum Bit Rate is known,

    * this value shall not exceed the DL-AMBR for the Internet PDN connection.

    * This must be filled with -1 if network is not connected.

    */

   uint32_t downlinkCapacityKbps;



   /**

    * Estimated uplink capacity in kbps. In case of a dual connected network,

    * this includes capacity of both primary and secondary. This bandwidth estimate shall be the

    * estimated maximum sustainable link bandwidth (as would be measured at the

    * Upper PDCP or SNDCP SAP). If the UL Aggregate Maximum Bit Rate is known,

    * this value shall not exceed the UL-AMBR for the Internet PDN connection.

    * This must be filled with -1 if network is not connected.

    */

   uint32_t uplinkCapacityKbps;



   /**

    * Estimated downlink capacity of secondary carrier in a dual connected NR mode in kbps.

    * This bandwidth estimate shall be the estimated maximum sustainable link bandwidth

    * (as would be measured at the Upper PDCP or SNDCP SAP). This is valid only

    * in if device is connected to both primary and secodary in dual connected

    * mode. This must be filled with -1 if secondary is not connected.

    */

   uint32_t secondaryDownlinkCapacityKbps;



   /**

    * Estimated uplink capacity secondary carrier in a dual connected NR mode in kbps.

    * This bandwidth estimate shall be the estimated

    * maximum sustainable link bandwidth (as would be measured at the Upper PDCP or SNDCP SAP).

    * This is valid only in if device is connected to both primary and secodary in dual connected

    * mode.This must be filled with -1 if secondary is not connected.

    */

   uint32_t secondaryUplinkCapacityKbps;

};

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+4 −0
Original line number Diff line number Diff line
@@ -865,6 +865,10 @@ class RadioIndication_v1_6 : public ::android::hardware::radio::V1_6::IRadioIndi 
            RadioIndicationType type,

            const ::android::hardware::radio::V1_2::LinkCapacityEstimate& lce);



    Return<void> currentLinkCapacityEstimate_1_6(

            RadioIndicationType type,

            const ::android::hardware::radio::V1_6::LinkCapacityEstimate& lce);



    Return<void> currentPhysicalChannelConfigs(

            RadioIndicationType type,

            const ::android::hardware::hidl_vec<

radio/1.6/vts/functional/radio_indication.cpp

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ Return<void> RadioIndication_v1_6::currentLinkCapacityEstimate( 
    return Void();

}



Return<void> RadioIndication_v1_6::currentLinkCapacityEstimate_1_6(

        RadioIndicationType /*type*/,

        const ::android::hardware::radio::V1_6::LinkCapacityEstimate& /*lce*/) {

    return Void();

}



Return<void> RadioIndication_v1_6::currentPhysicalChannelConfigs(

        RadioIndicationType /*type*/,

        const ::android::hardware::hidl_vec<