AI 148694: Manually copied from cupcake_dcm CL 148669-p9. When resetting the

  mode of the encoder, clear the leftover input & output buffers.
  This claims to fix buffer overwriting we're seeing during account
  sync and message download.
  BUG=1822859

Automated import of CL 148694

diff --git a/libcore/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java b/libcore/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
index 0fdb2c5..51d67ac 100644 (file)
--- a/libcore/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
+++ b/libcore/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
@@ -197,6 +197,10 @@ public final class CharsetEncoderICU extends CharsetEncoder {
         data[INVALID_CHARS] = 0;
         data[INPUT_HELD] = 0;
         savedInputHeldLen = 0;
+        // BEGIN android-added
+        output = null;
+        input = null;
+        // END android-added
     }
 
     /**