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

Commit 36b53149 authored by takafumi nakamura's avatar takafumi nakamura Committed by android-build-merger
Browse files

Merge "Add the conditions that determine the region for US, CA and JP" 

am: 9ca3b7a2

* commit '9ca3b7a2':
  Add the conditions that determine the region for US, CA and JP

Change-Id: Iadab5d92b7d900f867c6d107f1ad824d2dee9cbb
parents 7ce60542 9ca3b7a2

media/libmedia/ToneGenerator.cpp

+5 −2
Original line number Diff line number Diff line
@@ -815,9 +815,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 {

        mRegion = CEPT;