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

Commit a1179c55 authored by Jayachandran C's avatar Jayachandran C Committed by Automerger Merge Worker
Browse files

Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for... 

Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63 am: caf536d7 am: eaeb13c5 am: 98b15ce9 am: 95ef7661

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



Change-Id: I7a6813cdad9274a14b1a4ba85995856e4deb09ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5417f9d 95ef7661

radio/aidl/vts/radio_aidl_hal_utils.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ bool isSsSsEnabled() { 
    // Do not use checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "")

    // Do not use checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "")

    // until b/148904287 is fixed. We need exact matching instead of partial matching. (i.e.

    // until b/148904287 is fixed. We need exact matching instead of partial matching. (i.e.

    // by definition the empty string "" is a substring of any string).

    // by definition the empty string "" is a substring of any string).

    return !isDsDsEnabled() && !isTsTsEnabled();

    return !isDsDsEnabled() && !isTsTsEnabled() && !isDsDaEnabled();

}

}





bool isDsDsEnabled() {

bool isDsDsEnabled() {
@@ -125,8 +125,8 @@ bool isServiceValidForDeviceConfiguration(std::string& serviceName) { 
            ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());

            ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());

            return false;

            return false;

        }

        }

    } else if (isDsDsEnabled()) {

    } else if (isDsDsEnabled() || isDsDaEnabled()) {

        // Device is configured as DSDS.

        // Device is configured as DSDS or DSDA.

        if (!stringEndsWith(serviceName, RADIO_SERVICE_SLOT1_NAME) &&

        if (!stringEndsWith(serviceName, RADIO_SERVICE_SLOT1_NAME) &&

            !stringEndsWith(serviceName, RADIO_SERVICE_SLOT2_NAME)) {

            !stringEndsWith(serviceName, RADIO_SERVICE_SLOT2_NAME)) {

            ALOGI("%s instance is not valid for DSDS device.", serviceName.c_str());

            ALOGI("%s instance is not valid for DSDS device.", serviceName.c_str());