commit 4886c4942cbc4c905cfdd32e81a4c00bbbfd0216
author vichang <vichang@google.com> Thu Jan 21 20:08:30 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 20:08:30 2021 +0000
tree 01008ee5cf895de31abcaf1b8970ad7704f4bb90
parent 9d2dc23f7b5451cfdff82e9b63756da35336a7d8
parent 0053771ee33090475b3140060bf2efd9a1227762

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

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);