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

Commit f69feffd authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

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

am: f82e7a91

* commit 'f82e7a91':
  Fix tone region(for US, CA and JP) recognition for dual SIM

Change-Id: I39341bf5ae0f86f22bee26ac57a6867dbb353f4a
parents 714a433c f82e7a91

media/libmedia/ToneGenerator.cpp

+3 −6
Original line number Diff line number Diff line
@@ -832,13 +832,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 if (strcmp(value,"uk") == 0 ||

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