libbinder: BpBinder. move handle
note commit 85180c00b24af8ef6cf1a801d69b4906b74271ab
offset(BpBinder, mHandle) was exposed as API until mid 2019
but there is no real reason anyone should have used it (only really
needed for IPCThreadState/ProcessState/Parcel), so in order to simplify
some refactoring here, trying to move it to detect any breakages
early.
Bug: 167966510
Test: boot on many Pixel devices
Change-Id: Ie3eb90add4071615a31a947d2fcd3263613a4a48
diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp
index 8264154..bf4387a 100644
--- a/libs/binder/BpBinder.cpp
+++ b/libs/binder/BpBinder.cpp
@@ -137,8 +137,8 @@
}
BpBinder::BpBinder(int32_t handle, int32_t trackedUid)
- : mHandle(handle)
- , mStability(0)
+ : mStability(0)
+ , mHandle(handle)
, mAlive(1)
, mObitsSent(0)
, mObituaries(nullptr)
diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 64d0657..095ec8f 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -117,11 +117,12 @@
virtual bool onIncStrongAttempted(uint32_t flags, const void* id);
private:
- const int32_t mHandle;
friend ::android::internal::Stability;
int32_t mStability;
+ const int32_t mHandle;
+
struct Obituary {
wp<DeathRecipient> recipient;
void* cookie;