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

Commit 0e84c154 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Fix tone region(for US, CA and JP) recognition for dual SIM" into nyc-mr1-dev

parents c9a7b558 7a9c55c5

media/libmedia/ToneGenerator.cpp

+4 −8
Original line number Diff line number Diff line
@@ -832,16 +832,12 @@ 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 if (strcmp(value,"uk") == 0 ||

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

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

        mRegion = UK;

    } else {

        mRegion = CEPT;