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

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

Merge "Add the conditions that determine the region for US, CA and JP" into nyc-mr1-dev

parents cabaa2cd 3743febf

media/libmedia/ToneGenerator.cpp

+5 −2
Original line number Diff line number Diff line
@@ -833,9 +833,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,"ca") == 0) {

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

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

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

        mRegion = ANSI;

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

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

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

        mRegion = JAPAN;

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

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