commit da0cb21057bbee1196b884f8163fe8730d4b85f5
author Vic Yang <victoryang@google.com> Tue Oct 01 17:14:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 01 17:14:48 2019 -0700
tree ee15e570339428cfc64210aaec265412893c0655
parent 35a39b9e7a7a3ca37a18818641ea836ce576d389
parent 87cb2bcc9e77a1bc506ec20351c10086fb9eb0b8

Merge "Fix memory leak in String16" am: 9a66161585 am: 73ac1266c5 am: 230e0e6439
am: 5be5b534c9

Change-Id: Id969526579f98b9bbb21acab882617af9147e1c2

libutils/String16.cpp

diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index 5c3cf32..e2a8c59 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -346,7 +346,6 @@
     if (isStaticString()) {
         buf = static_cast<SharedBuffer*>(alloc((size() + 1) * sizeof(char16_t)));
         if (buf) {
-            buf->acquire();
             memcpy(buf->data(), mString, (size() + 1) * sizeof(char16_t));
         }
     } else {
@@ -365,7 +364,6 @@
         }
         buf = static_cast<SharedBuffer*>(alloc(newSize));
         if (buf) {
-            buf->acquire();
             memcpy(buf->data(), mString, copySize);
         }
     } else {