commit 0053771ee33090475b3140060bf2efd9a1227762
author Victor Chang <vichang@google.com> Wed Jan 20 11:56:09 2021 +0000
committer Victor Chang <vichang@google.com> Wed Jan 20 13:50:53 2021 +0000
tree 35b4e85249efe32477c6ef6d4e4ee3838dccda88
parent 4bc812d42d9103cb7142884af3421ad13fee66ca

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

See details at https://unicode-org.atlassian.net/browse/ICU-21267

Bug: 160356314
Test: m droid
Change-Id: Ida74383fc92b63fd1529049e96a486639302f54d

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