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

Commit f2c4d367 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Mark RSSNR in 4G as an optional support, and vendor dependency" 

am: ebfc8c2e

Change-Id: I9ed8d755a7eb365ac4b7e9f94c42194b2f0acd21
parents 572970bc ebfc8c2e

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardwar 
db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types

34515afa2bb792d3c6d8495a5f5d907d179c8507ca5e55c10050d02ae1d516ef android.hardware.neuralnetworks@1.3::IDevice

b74fe72cfe438f50e772e6a307657ff449d5bde83c15dd1f140ff2edbe73499c android.hardware.neuralnetworks@1.3::types

d3636ff9d5fef59f59f678887209156b2608d29f676fb1e600fe33b7e57a8a61 android.hardware.radio@1.5::types

ba759fab7dd4cd621b492ef8f44312d4a716af786786f404d1477cc8cea6f392 android.hardware.radio@1.5::types

c8e81d912827a5d49b2ddcdc4eb4556c5d231a899a1dca879309e04210daa4a0 android.hardware.radio@1.5::IRadio

a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication

260ce05806d753d728f844d405e832179ed7d9b65986ec18fef3d21cf7285587 android.hardware.radio@1.5::IRadioResponse

radio/1.5/types.hal

+4 −2
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ enum SignalMeasurementType : int32_t { 
     * Reference Signal Signal to Noise Ratio

     * Range: -20 dB to -30 dB;

     * Used RAN: EUTRAN

     * Reference: 3GPP TS 36.101 8.1.1

     * Note: this field is optional; how to support it can be decided by the

     * corresponding vendor. Though the response code is not enforced,

     * vendor's implementation must ensure this interface not crashing.

     */

    RSSNR = 5,

    /**

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+1 −5
Original line number Diff line number Diff line
@@ -179,10 +179,6 @@ TEST_F(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_Eutran_RSSNR) 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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



    ALOGI("setSignalStrengthReportingCriteria_1_5_Eutran, rspInfo.error = %s\n",

          toString(radioRsp_v1_5->rspInfo.error).c_str());

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));

}



/*