commit 11eb6a38697d5dfe7db9e3a6ac68f94f376e4517
author Mark Salyzyn <salyzyn@google.com> Fri Dec 11 07:32:31 2015 -0800
committer Mark Salyzyn <salyzyn@google.com> Fri Dec 11 07:32:31 2015 -0800
tree 0128397557e2abaa64acbfaf63ce5b1f9a0089d6
parent f0def71e239fd7cbc91883a407381bdd75162552
parent 6d4da08bffab4fafab81b73d7ef20b9ffae51bfe

resolve merge conflicts of 01c1129fe6 to master.

Change-Id: I84f862b4858ecc97461750833a0e6f9cf96c34c4

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;