Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed99cf81 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: add log for dropped extension" am: 9c5c944e am: 70f8196c... 

Merge "libbinder: add log for dropped extension" am: 9c5c944e am: 70f8196c am: f17fce91 am: 6451714a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2052072



Change-Id: Ia75c44b44f1aa77f506b30637e91f0396881181d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8c2a602 6451714a

libs/binder/Binder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -582,6 +582,10 @@ void BBinder::removeRpcServerLink(const sp<RpcServerLink>& link) { 


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

+7 −0
Original line number Diff line number Diff line
@@ -41,3 +41,10 @@ TEST(Binder, DetachObject) { 
    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());

}