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

Commit 5ac9829a authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "add slicingConfigChanged api" am: 4e9056b7 am: 30112172 am: fe44256c am: 144ac586 

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

Change-Id: I7dbb30c6e11ebb01d3784e728605283c2aa19f5e
parents 78e65285 144ac586

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/IRadioDataIndication.aidl

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ interface IRadioDataIndication { 
  oneway void keepaliveStatus(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.KeepaliveStatus status);

  oneway void pcoData(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.PcoDataInfo pco);

  oneway void unthrottleApn(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.DataProfileInfo dataProfileInfo);

  oneway void slicingConfigChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.SlicingConfig slicingConfig);

}

radio/aidl/android/hardware/radio/data/IRadioDataIndication.aidl

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.hardware.radio.data.DataProfileInfo; 
import android.hardware.radio.data.KeepaliveStatus;

import android.hardware.radio.data.PcoDataInfo;

import android.hardware.radio.data.SetupDataCallResult;

import android.hardware.radio.data.SlicingConfig;



/**

 * Interface declaring unsolicited radio indications for data APIs.
@@ -72,4 +73,17 @@ oneway interface IRadioDataIndication { 
     * @param dataProfileInfo Data profile info.

     */

    void unthrottleApn(in RadioIndicationType type, in DataProfileInfo dataProfileInfo);



    /**

     * Indicates the current slicing configuration including URSP rules and NSSAIs

     * (configured, allowed and rejected). URSP stands for UE route selection policy and is defined

     * in 3GPP TS 24.526 Section 4.2. An NSSAI is a collection of network slices. Each network slice

     * is identified by an S-NSSAI and is represented by the struct SliceInfo. NSSAI and S-NSSAI

     * are defined in 3GPP TS 24.501.

     *

     * @param type Type of radio indication

     * @param slicingConfig Current slicing configuration

     *

     */

    void slicingConfigChanged(in RadioIndicationType type, in SlicingConfig slicingConfig);

}

radio/aidl/compat/libradiocompat/data/RadioIndication-data.cpp

+7 −0
Original line number Diff line number Diff line
@@ -85,4 +85,11 @@ Return<void> RadioIndication::unthrottleApn(V1_0::RadioIndicationType type, 
    return {};

}



Return<void> RadioIndication::slicingConfigChanged(V1_0::RadioIndicationType type,

                                                   const V1_6::SlicingConfig& slicingConfig) {

    LOG_CALL << type;

    dataCb()->slicingConfigChanged(toAidl(type), toAidl(slicingConfig));

    return {};

}



}  // namespace android::hardware::radio::compat

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ class RadioIndication : public V1_6::IRadioIndication { 
            V1_0::RadioIndicationType type,

            const hidl_vec<V1_6::SetupDataCallResult>& dcList) override;

    Return<void> unthrottleApn(V1_0::RadioIndicationType type, const hidl_string& apn) override;

    Return<void> slicingConfigChanged(V1_0::RadioIndicationType type,

                                      const V1_6::SlicingConfig& slicingConfig);

    Return<void> currentLinkCapacityEstimate_1_6(V1_0::RadioIndicationType type,

                                                 const V1_6::LinkCapacityEstimate& lce) override;

    Return<void> currentSignalStrength_1_6(V1_0::RadioIndicationType type,

radio/aidl/vts/radio_data_indication.cpp

+5 −0
Original line number Diff line number Diff line
@@ -37,3 +37,8 @@ ndk::ScopedAStatus RadioDataIndication::unthrottleApn(RadioIndicationType /*type 
                                                      const DataProfileInfo& /*dataProfileInfo*/) {

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus RadioDataIndication::slicingConfigChanged(

        RadioIndicationType /*type*/, const SlicingConfig& /*slicingConfig*/) {

    return ndk::ScopedAStatus::ok();

}