commit fd23c8a9f49b9cf2df7fde03e51ac7c0f9f30aaf
author Martijn Coenen <maco@google.com> Fri Dec 07 00:31:39 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 07 00:31:39 2018 -0800
tree e8e4f6f83f3ab8fad78c22c6ffe294b173aa7485
parent 582131a7cf94044a8bd3fffe73e1c81b58736254
parent ec20355aa21a1cbdc4c9f2da6bce7d689382d9ed

Merge "Don't initialize ProcessState unless we need to." am: 5f7692f5b2
am: ec20355aa2

Change-Id: Ieb3324dddabe3f7419de991c4cb546e3ae5653a1

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 07d5c4b..b2db945 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -467,7 +467,6 @@
 
 status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
 {
-    const sp<ProcessState> proc(ProcessState::self());
     status_t err;
     const uint8_t *data = parcel->mData;
     const binder_size_t *objects = parcel->mObjects;
@@ -520,6 +519,7 @@
     err = NO_ERROR;
 
     if (numObjects > 0) {
+        const sp<ProcessState> proc(ProcessState::self());
         // grow objects
         if (mObjectsCapacity < mObjectsSize + numObjects) {
             size_t newSize = ((mObjectsSize + numObjects)*3)/2;
@@ -2543,8 +2543,11 @@
 
 void Parcel::releaseObjects()
 {
-    const sp<ProcessState> proc(ProcessState::self());
     size_t i = mObjectsSize;
+    if (i == 0) {
+        return;
+    }
+    sp<ProcessState> proc(ProcessState::self());
     uint8_t* const data = mData;
     binder_size_t* const objects = mObjects;
     while (i > 0) {
@@ -2557,8 +2560,11 @@
 
 void Parcel::acquireObjects()
 {
-    const sp<ProcessState> proc(ProcessState::self());
     size_t i = mObjectsSize;
+    if (i == 0) {
+        return;
+    }
+    const sp<ProcessState> proc(ProcessState::self());
     uint8_t* const data = mData;
     binder_size_t* const objects = mObjects;
     while (i > 0) {