commit 9c6cc8757954bd593081971fdb475825b2320613
author Steven Moreland <smoreland@google.com> Mon Nov 23 17:32:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 23 17:32:40 2020 +0000
tree 06a29542bf479a8791b6d79f85058c1d2bc515bd
parent d9d4ed6c1737eec03a68d0d8059d6dabebdc0c83
parent 0b9c9a81e670ccbaf655217a965fb523794e6961

Merge changes I30c813d3,Ie3eb90ad

* changes:
  libbinder: avoid BpBinder subclasses
  libbinder: BpBinder. move handle

libs/binder/BpBinder.cpp

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)

libs/binder/include/binder/BpBinder.h

diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 64d0657..a0e28d2 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -109,19 +109,18 @@
         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;