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

Commit 812a33cb authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "add capability for TelephonyManager.getNetworkSlicingConfiguration()" into sc-dev

parents eaeb1bc5 723021f4

radio/1.6/IRadioResponse.hal

+1 −0
Original line number Original line Diff line number Diff line
@@ -433,6 +433,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     *   RadioError:INTERNAL_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:REQUEST_NOT_SUPPORTED

     */

     */

    oneway getSlicingConfigResponse(RadioResponseInfo info,

    oneway getSlicingConfigResponse(RadioResponseInfo info,

            SlicingConfig slicingConfig);

            SlicingConfig slicingConfig);

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -172,8 +172,14 @@ TEST_P(RadioHidlTest_v1_6, getSlicingConfig) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);

    if (getRadioHalCapabilities().modemReducedFeatureSet1) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

    } else {

        EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error);

        EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error);

    }

    }

}





/*

/*

 * Test IRadio_1_6.sendSms() for the response returned.

 * Test IRadio_1_6.sendSms() for the response returned.

radio/config/1.3/types.hal

+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ struct HalDeviceCapabilities { 
   * </li>

   * </li>

   * <li>Requesting android.hardware.radio@1.6::IRadio.setDataThrottling()

   * <li>Requesting android.hardware.radio@1.6::IRadio.setDataThrottling()

   * </li>

   * </li>

   * <li>Providing android.hardware.radio@1.6::SlicingConfig through

   * android.hardware.radio@1.6::getSlicingConfig()

   * </li>

   * </ul>

   * </ul>

   */

   */

  bool modemReducedFeatureSet1;

  bool modemReducedFeatureSet1;

radio/config/1.3/vts/functional/radio_config_hidl_hal_utils.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 




#include "vts_test_util.h"

#include "vts_test_util.h"





using namespace ::android::hardware::radio::config::V1_2;

using namespace ::android::hardware::radio::config::V1_3;





using ::android::sp;

using ::android::sp;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_string;
@@ -46,9 +46,11 @@ using ::android::hardware::Return; 
using ::android::hardware::Void;

using ::android::hardware::Void;

using ::android::hardware::radio::config::V1_1::ModemsConfig;

using ::android::hardware::radio::config::V1_1::ModemsConfig;

using ::android::hardware::radio::config::V1_1::PhoneCapability;

using ::android::hardware::radio::config::V1_1::PhoneCapability;

using ::android::hardware::radio::config::V1_2::IRadioConfigIndication;

using ::android::hardware::radio::config::V1_2::SimSlotStatus;

using ::android::hardware::radio::config::V1_2::SimSlotStatus;

using ::android::hardware::radio::config::V1_3::HalDeviceCapabilities;

using ::android::hardware::radio::config::V1_3::HalDeviceCapabilities;

using ::android::hardware::radio::config::V1_3::IRadioConfig;

using ::android::hardware::radio::config::V1_3::IRadioConfig;

using ::android::hardware::radio::config::V1_3::IRadioConfigResponse;

using ::android::hardware::radio::V1_0::RadioResponseInfo;

using ::android::hardware::radio::V1_0::RadioResponseInfo;





#define RADIO_SERVICE_NAME "slot1"

#define RADIO_SERVICE_NAME "slot1"

radio/config/1.3/vts/functional/radio_config_response.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -64,8 +64,9 @@ Return<void> RadioConfigResponse::setModemsConfigResponse( 
}

}





Return<void> RadioConfigResponse::getHalDeviceCapabilitiesResponse(

Return<void> RadioConfigResponse::getHalDeviceCapabilitiesResponse(

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

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

        const ::android::hardware::radio::config::V1_3::HalDeviceCapabilities& capabilities) {

        const ::android::hardware::radio::config::V1_3::HalDeviceCapabilities& capabilities) {

    halDeviceCapabilities = capabilities;

    halDeviceCapabilities = capabilities;

    parent.notify(info.serial);

    return Void();

    return Void();

}
 
}