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

Commit 7d255a3a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9358895 from 29e1bf6b to udc-release 

Change-Id: I210e2060e6e086af398e9e05d851c77c96233acd
parents 08b315c3 29e1bf6b

compatibility_matrices/compatibility_matrix.current.xml

+7 −0
Original line number Diff line number Diff line
@@ -676,6 +676,13 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.usb.gadget</name>

        <interface>

            <name>IUsbGadget</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.vibrator</name>

        <version>1-2</version>

neuralnetworks/1.0/vts/functional/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ cc_defaults { 
    name: "neuralnetworks_vts_functional_defaults",

    defaults: [

        "VtsHalTargetTestDefaults",

        "neuralnetworks_float16",

    ],

}

radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl

+5 −1
Original line number Diff line number Diff line
@@ -488,7 +488,11 @@ oneway interface IRadioNetwork { 
    /**

     * Set if null encryption and integrity modes are enabled. If the value of enabled is false

     * the modem must not allow any network communications with null ciphering or null integrity

     * modes. In case of an emergency call, the modem must bypass this setting.

     * modes.

     *

     * In the case when enabled is false, integrity protection for user data is optional, but

     * ciphering for user data is required. In case of an emergency call, the modem must bypass

     * this setting.

     *

     * Null ciphering and integrity modes include (but are not limited to):

     * 2G: A5/0

radio/aidl/vts/radio_network_test.cpp

+18 −0
Original line number Diff line number Diff line
@@ -1961,3 +1961,21 @@ TEST_P(RadioNetworkTest, isN1ModeEnabled) { 
                 RadioError::REQUEST_NOT_SUPPORTED, RadioError::NONE}));

    }

}



/*

 * Test IRadioNetwork.setNullCipherAndIntegrityEnabled() for the response returned.

 */

TEST_P(RadioNetworkTest, setNullCipherAndIntegrityEnabled) {

    LOG(DEBUG) << "setNullCipherAndIntegrityEnabled";

    serial = GetRandomSerialNumber();



    radio_network->setNullCipherAndIntegrityEnabled(serial, false);

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

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

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



    ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_network->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));

    LOG(DEBUG) << "setNullCipherAndIntegrityEnabled finished";

}

sensors/common/default/2.X/multihal/HalProxy.cpp

+5 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ int64_t msFromNs(int64_t nanos) { 
}



HalProxy::HalProxy() {

    const char* kMultiHalConfigFile = "/vendor/etc/sensors/hals.conf";

    initializeSubHalListFromConfigFile(kMultiHalConfigFile);

    static const std::string kMultiHalConfigFiles[] = {"/vendor/etc/sensors/hals.conf",

                                                       "/odm/etc/sensors/hals.conf"};

    for (const std::string& configFile : kMultiHalConfigFiles) {

        initializeSubHalListFromConfigFile(configFile.c_str());

    }

    init();

}