commit 2af771c3ba9c54a10b4c5cb4d0e77a928823173f
author Shikha Malhotra <shikhamalhotra@google.com> Mon Apr 04 12:44:42 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 04 12:44:42 2022 +0000
tree 5724ed32d63311f1490059f8e57973abc67bc1a4
parent 9c5c944e25e0e9632b4985f159be897885937359
parent af5e968482824e5b106f32d6460616880e2da181

Merge "Check for IOCTL feature changed to not set inheritence"

libs/binder/Binder.cpp

diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 01b25d3..39befbe 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -582,6 +582,10 @@
 
 BBinder::~BBinder()
 {
+    if (!wasParceled() && getExtension()) {
+        ALOGW("Binder %p destroyed with extension attached before being parceled.", this);
+    }
+
     Extras* e = mExtras.load(std::memory_order_relaxed);
     if (e) delete e;
 }

libs/binder/tests/binderBinderUnitTest.cpp

diff --git a/libs/binder/tests/binderBinderUnitTest.cpp b/libs/binder/tests/binderBinderUnitTest.cpp
index 1be0c59..ce2770f 100644
--- a/libs/binder/tests/binderBinderUnitTest.cpp
+++ b/libs/binder/tests/binderBinderUnitTest.cpp
@@ -41,3 +41,10 @@
     EXPECT_EQ(kObject1, binder->detachObject(kObjectId1));
     EXPECT_EQ(nullptr, binder->attachObject(kObjectId1, kObject2, nullptr, nullptr));
 }
+
+TEST(Binder, AttachExtension) {
+    auto binder = sp<BBinder>::make();
+    auto ext = sp<BBinder>::make();
+    binder->setExtension(ext);
+    EXPECT_EQ(ext, binder->getExtension());
+}