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

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

Merge \\\\"Fix for wrong ringtone when using VoWiFi\\\\" am: e3596517 am:... 

Merge \\\\"Fix for wrong ringtone when using VoWiFi\\\\" am: e3596517 am: 87f033a1 am: 357b8473
am: 6c6cd5f2

Change-Id: Id6cfb7c108bd9e7168412bfa45eb865552f36a3a
parents 63a05b4d 6c6cd5f2

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;