libbinder_ndk: avoid BpRefBase
This is OBJECT_LIFETIME_WEAK which makes things
complicated. The goal of this is to be able to
support this kind of thing:
sp<IFoo> foo = ... // get service;
wp<IFoo> wFoo = foo;
foo = nullptr;
sp<IFoo> foo2 = ... // get service again;
EXPECT_EQ(wFoo.promote(), foo2);
However, because ABpBinder onLastStrongRef expunged
the wp binder reference, this did not work in the
NDK backend of binder before. This works for BpBinder
because BpBinder does not call expungeHandle until
~BpBinder. However, because we need the reference
from our BpBinder to the BpRefBase, it becomes
circular. I'm not sure, with the current
implementation of RefBase, it would be possible
to get this behavior. In the future, if we wanted
it, we could make all BpBinder objects also be
ABpBinder objects. This would avoid the extra
allocation and avoid the need for the proxy object.
Bug: 220141324
Test: CtsNdkBinderTestCases
Change-Id: I934a12baec625da1c3a0d5052d446523dc4c1f89
diff --git a/libs/binder/ndk/ibinder.cpp b/libs/binder/ndk/ibinder.cpp
index b21a7e9..9778ec0 100644
--- a/libs/binder/ndk/ibinder.cpp
+++ b/libs/binder/ndk/ibinder.cpp
@@ -64,6 +64,9 @@
wp<ABpBinder> binder;
};
void clean(const void* id, void* obj, void* cookie) {
+ // be weary of leaks!
+ // LOG(INFO) << "Deleting an ABpBinder";
+
CHECK(id == kId) << id << " " << obj << " " << cookie;
delete static_cast<Value*>(obj);
@@ -239,26 +242,11 @@
}
ABpBinder::ABpBinder(const ::android::sp<::android::IBinder>& binder)
- : AIBinder(nullptr /*clazz*/), BpRefBase(binder) {
+ : AIBinder(nullptr /*clazz*/), mRemote(binder) {
CHECK(binder != nullptr);
}
ABpBinder::~ABpBinder() {}
-void ABpBinder::onLastStrongRef(const void* id) {
- // Since ABpBinder is OBJECT_LIFETIME_WEAK, we must remove this weak reference in order for
- // the ABpBinder to be deleted. Even though we have no more references on the ABpBinder
- // (BpRefBase), the remote object may still exist (for instance, if we
- // receive it from another process, before the ABpBinder is attached).
-
- ABpBinderTag::Value* value =
- static_cast<ABpBinderTag::Value*>(remote()->findObject(ABpBinderTag::kId));
- CHECK_NE(nullptr, value) << "ABpBinder must always be attached";
-
- remote()->withLock([&]() { value->binder = nullptr; });
-
- BpRefBase::onLastStrongRef(id);
-}
-
sp<AIBinder> ABpBinder::lookupOrCreateFromBinder(const ::android::sp<::android::IBinder>& binder) {
if (binder == nullptr) {
return nullptr;