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

Commit b01ac385 authored by Eric Laurent's avatar Eric Laurent
Browse files

resolve merge conflicts of c9a7b558 to nyc-mr1-dev-plus-aosp 

Change-Id: I07b5b3213dd034ebed781648ccc8158c077f493f
parents 64a4f4ca c9a7b558

media/libmedia/ToneGenerator.cpp

+1 −2
Original line number Diff line number Diff line
@@ -839,8 +839,7 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool 
        mRegion = ANSI;

    } else if (strstr(value, "jp") != NULL) {

        mRegion = JAPAN;

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

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

    } else if (strstr(value, "uk") != NULL) {

        mRegion = UK;

    } else {

        mRegion = CEPT;