commit 6d4da08bffab4fafab81b73d7ef20b9ffae51bfe
author Colin Cross <ccross@android.com> Thu Dec 10 13:21:47 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 13:21:47 2015 -0800
tree 44936cd8ccd9e18b357da8f501bdf9fe2bfe6218
parent 7a0ca82bea11bf08fea28eb7dc068cd7eb171e28
parent 02f61fc27abdd95b6f738ec0ea896368b7d4e6a7

Merge "Fix allocation count"
am: b25116f735

* commit 'b25116f735e00467057085c18a984aca0cc93a84':
  Fix allocation count

Parcel.cpp

diff --git a/Parcel.cpp b/Parcel.cpp
index 13ecc87..3ca49b1 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -1987,6 +1987,9 @@
         pthread_mutex_lock(&gParcelGlobalAllocSizeLock);
         gParcelGlobalAllocSize += desired;
         gParcelGlobalAllocSize -= mDataCapacity;
+        if (!mData) {
+            gParcelGlobalAllocCount++;
+        }
         pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);
         mData = data;
         mDataCapacity = desired;
@@ -2118,7 +2121,6 @@
                 pthread_mutex_lock(&gParcelGlobalAllocSizeLock);
                 gParcelGlobalAllocSize += desired;
                 gParcelGlobalAllocSize -= mDataCapacity;
-                gParcelGlobalAllocCount++;
                 pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);
                 mData = data;
                 mDataCapacity = desired;