diff options
| -rw-r--r-- | libs/binder/BpBinder.cpp | 4 | ||||
| -rw-r--r-- | libs/binder/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | libs/binder/include/binder/BpBinder.h | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp index 8264154b5f..bf4387a0a1 100644 --- a/libs/binder/BpBinder.cpp +++ b/libs/binder/BpBinder.cpp @@ -137,8 +137,8 @@ BpBinder* BpBinder::create(int32_t handle) { } 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/TEST_MAPPING b/libs/binder/TEST_MAPPING index dafc87952f..1cfb560f82 100644 --- a/libs/binder/TEST_MAPPING +++ b/libs/binder/TEST_MAPPING @@ -53,9 +53,7 @@ }, { "name": "libbinder_rs-internal_test" - } - ], - "postsubmit": [ + }, { "name": "rustBinderTest" } diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h index 64d0657edf..a0e28d2543 100644 --- a/libs/binder/include/binder/BpBinder.h +++ b/libs/binder/include/binder/BpBinder.h @@ -109,19 +109,18 @@ public: KeyedVector<const void*, entry_t> mObjects; }; -protected: +private: BpBinder(int32_t handle,int32_t trackedUid); virtual ~BpBinder(); virtual void onFirstRef(); virtual void onLastStrongRef(const void* id); 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; |