commit e42a54b17768ea80f198c1b00bc6c4797a4485d8
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 24 00:41:21 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 24 00:41:21 2020 +0000
tree 99794ba792fc06afb7ce7f08b19b165287c7749c
parent 80315724d28a80451874874232a8dbcd2e57a6ad
parent 12623df409ab8ada80e344ca852bdbc41736adb4

Merge "setParcelable uses const ref instead of pointer"

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/TEST_MAPPING

diff --git a/libs/binder/TEST_MAPPING b/libs/binder/TEST_MAPPING
index dafc879..1cfb560 100644
--- a/libs/binder/TEST_MAPPING
+++ b/libs/binder/TEST_MAPPING
@@ -53,9 +53,7 @@
     },
     {
       "name": "libbinder_rs-internal_test"
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "rustBinderTest"
     }

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;