commit c323ac13e9f803fa6a50132db62ef3689c6c776c
author Steven Moreland <smoreland@google.com> Mon Nov 23 18:50:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 23 18:50:58 2020 +0000
tree 3ac138505449168dd98e12c3d3ebe856d1fc685c
parent 2a685820e69bc71e3fe8280072af5a0966929d59
parent 775fe1222d77807046e9e8763a020c150c0bea96

Merge changes I30c813d3,Ie3eb90ad am: 9c6cc87579 am: 775fe1222d

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

Change-Id: I0792ffd92fc97f2719272de3456dbcf4224f839d

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;