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

Commit 00637563 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Update CharacterEncodingDetector.cpp to remove TRUE/FALSE macro usage... 

Merge "Update CharacterEncodingDetector.cpp to remove TRUE/FALSE macro usage due to ICU 68" am: 4886c494 am: d2bceb08

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1554498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4557f966369c659b23e689ffb456bc971af8520e
parents ad554c64 d2bceb08

media/libmedia/CharacterEncodingDetector.cpp

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void CharacterEncodingDetector::detectAndConvert() { 


                ucnv_convertEx(mUtf8Conv, conv, &target, target + targetLength,

                        &source, source + strlen(source),

                        NULL, NULL, NULL, NULL, TRUE, TRUE, &status);

                        NULL, NULL, NULL, NULL, true, true, &status);



                if (U_FAILURE(status)) {

                    ALOGE("ucnv_convertEx failed: %d", status);