commit dfe64a234275d8909ae09ebbb447b04e9dc8a0c1
author Xin Li <delphij@google.com> Fri Apr 01 20:32:35 2022 +0000
committer Xin Li <delphij@google.com> Fri Apr 01 20:32:35 2022 +0000
tree a685be5aa0681d2cbbb21d07d60c20e510766677
parent 70f8196ce20bb278deb06ec8f8a28236e1fdfc83
parent f0fba372a99877db0f488069ea46f3858f04dca9

Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I2ad173ddded3c865cf78794a5f218cfc8a89c16b
Change-Id: I7dec123a77ddc4c30af22ba80a8d0ddbc308857b

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());
+}