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

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

Merge "Fix for wrong ringtone when using VoWiFi" into nyc-mr1-dev

parents 0e84c154 1bcae276

media/libmedia/ToneGenerator.cpp

+3 −1
Original line number Diff line number Diff line
@@ -831,7 +831,9 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool 
    mProcessSize = (mSamplingRate * 20) / 1000;



    char value[PROPERTY_VALUE_MAX];

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

    if (property_get("gsm.operator.iso-country", value, "") == 0) {

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

    }

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

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

        mRegion = ANSI;