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

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

Snap for 11286711 from 4f598457 to 24Q2-release

Change-Id: I83260d663cc79cd8fb45c28381ef23a1fc3c3ac8
parents 04311a11 4f598457
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
package android.hardware.bluetooth.finder;

/**
 * Ephemeral Identifier
 * Find My Device network ephemeral identifier
 */
@VintfStability
parcelable Eid {
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.hardware.bluetooth.finder.Eid;
@VintfStability
interface IBluetoothFinder {
    /**
     * API to set the EIDs to the Bluetooth Controller
     * API to set Find My Device network EIDs to the Bluetooth Controller
     *
     * @param eids array of 20 bytes EID to the Bluetooth
     * controller
+2 −1
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ ndk::ScopedAStatus RadioConfigResponse::getPhoneCapabilityResponse(
}

ndk::ScopedAStatus RadioConfigResponse::getSimultaneousCallingSupportResponse(
        const RadioResponseInfo& info, const std::vector<int32_t>& /* enabledLogicalSlots */) {
        const RadioResponseInfo& info, const std::vector<int32_t>& enabledLogicalSlots) {
    rspInfo = info;
    currentEnabledLogicalSlots = enabledLogicalSlots;
    parent_config.notify(info.serial);
    return ndk::ScopedAStatus::ok();
}
+8 −1
Original line number Diff line number Diff line
@@ -150,10 +150,17 @@ TEST_P(RadioConfigTest, getSimultaneousCallingSupport) {
    ALOGI("getSimultaneousCallingSupport, rspInfo.error = %s\n",
          toString(radioRsp_config->rspInfo.error).c_str());

    // REQUEST_NOT_SUPPORTED is omitted here because users of the V3 HAL should implement this
    // method and return at least an empty array
    ASSERT_TRUE(CheckAnyOfErrors(
            radioRsp_config->rspInfo.error,
            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INTERNAL_ERR,
            RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
            RadioError::MODEM_ERR}));

    if (radioRsp_config->rspInfo.error == RadioError ::NONE) {
        // The size of enabledLogicalSLots should be 0 or a positive number:
        EXPECT_GE(radioRsp_config->currentEnabledLogicalSlots.size(), 0);
    }
}

/*
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class RadioConfigResponse : public BnRadioConfigResponse {
    PhoneCapability phoneCap;
    bool modemReducedFeatureSet1;
    std::vector<SimSlotStatus> simSlotStatus;
    std::vector<int32_t> currentEnabledLogicalSlots;

    virtual ndk::ScopedAStatus getSimSlotsStatusResponse(
            const RadioResponseInfo& info, const std::vector<SimSlotStatus>& slotStatus) override;
Loading