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

Commit 5b326e16 authored by Eric Laurent's avatar Eric Laurent Committed by Gerrit Code Review
Browse files

Merge "Fix tone region(for US, CA and JP) recognition for dual SIM"

parents 3156b5dc 0bc9277c

media/libmedia/ToneGenerator.cpp

+3 −6
Original line number Diff line number Diff line
@@ -814,13 +814,10 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool 


    char value[PROPERTY_VALUE_MAX];

    property_get("gsm.operator.iso-country", value, "");

    if (strcmp(value,"us") == 0 ||

        strcmp(value,"us,us") == 0 ||

        strcmp(value,"ca") == 0 ||

        strcmp(value,"ca,ca") == 0) {

    if (strstr(value, "us") != NULL ||

        strstr(value, "ca") != NULL) {

        mRegion = ANSI;

    } else if (strcmp(value,"jp") == 0 ||

               strcmp(value,"jp,jp") == 0) {

    } else if (strstr(value, "jp") != NULL) {

        mRegion = JAPAN;

    } else {

        mRegion = CEPT;