commit 9b1e10db7337020b52a8d935fcc8939431e411ca
author Steven Moreland <smoreland@google.com> Fri Sep 25 17:05:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 25 17:05:40 2020 +0000
tree 1542ca43300fac280256493637592c5fd2d16b8f
parent 094560d10b262fd04a75fd603a54cb5eb7b0d66a
parent 4a1026a7164f2405f7a297b9dbf6948654e96855

Merge "libbinder_ndk: avoid need to allocate heap status"

libs/binder/ndk/include_cpp/android/binder_auto_utils.h

diff --git a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
index f59bb75..439b019 100644
--- a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h
@@ -199,6 +199,9 @@
    public:
     /**
      * Takes ownership of a.
+     *
+     * WARNING: this constructor is only expected to be used when reading a
+     *     status value. Use `ScopedAStatus::ok()` instead.
      */
     explicit ScopedAStatus(AStatus* a = nullptr) : ScopedAResource(a) {}
     ~ScopedAStatus() {}

libs/binder/ndk/status.cpp

diff --git a/libs/binder/ndk/status.cpp b/libs/binder/ndk/status.cpp
index 4fd59a2..a8ae441 100644
--- a/libs/binder/ndk/status.cpp
+++ b/libs/binder/ndk/status.cpp
@@ -23,7 +23,8 @@
 using ::android::binder::Status;
 
 AStatus* AStatus_newOk() {
-    return new AStatus();
+    static AStatus status = AStatus();
+    return &status;
 }
 
 AStatus* AStatus_fromExceptionCode(binder_exception_t exception) {
@@ -78,7 +79,9 @@
 }
 
 void AStatus_delete(AStatus* status) {
-    delete status;
+    if (status != AStatus_newOk()) {
+        delete status;
+    }
 }
 
 binder_status_t PruneStatusT(status_t status) {