commit d2bceb08eff4d1ca1dec57457b8c24ad2eb65a96
author vichang <vichang@google.com> Thu Jan 21 21:15:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 21 21:15:15 2021 +0000
tree 01008ee5cf895de31abcaf1b8970ad7704f4bb90
parent 759287161e9827cb2bb2167524d91c9011fc92dc
parent 4886c4942cbc4c905cfdd32e81a4c00bbbfd0216

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bfc420fddf52cb7acff7483f47ad55a9a394119

media/libmedia/CharacterEncodingDetector.cpp

diff --git a/media/libmedia/CharacterEncodingDetector.cpp b/media/libmedia/CharacterEncodingDetector.cpp
index 5c6b981..64ba977 100644
--- a/media/libmedia/CharacterEncodingDetector.cpp
+++ b/media/libmedia/CharacterEncodingDetector.cpp
@@ -268,7 +268,7 @@
 
                 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);