commit f03997b7f2ee67ffed2985d5135fa9a7ea0024aa
author Steven Moreland <smoreland@google.com> Fri Sep 06 19:13:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 06 19:13:43 2019 +0000
tree 8d696d406ce8505b3a34844c69c56a25ef3c996d
parent 766c08dccf41e068819e0d48892106f3d125f5d6
parent 7546d3ee0d86f1cd676ed8fcdea03f5c6fefc913

Merge changes Ia43d6dae,I09ec7969

* changes:
  libbinder: -= unimplemented readRequestHeaders.
  binder: readCallingWorkSourceUid make const

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 8751ecb..ed6c834 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -541,7 +541,7 @@
     return err == NO_ERROR;
 }
 
-uid_t Parcel::readCallingWorkSourceUid()
+uid_t Parcel::readCallingWorkSourceUid() const
 {
     if (!mRequestHeaderPresent) {
         return IPCThreadState::kUnsetWorkSource;

libs/binder/include/binder/Parcel.h

diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index 0a4f906..518c083 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -377,8 +377,7 @@
     bool                replaceCallingWorkSourceUid(uid_t uid);
     // Returns the work source provided by the caller. This can only be trusted for trusted calling
     // uid.
-    uid_t               readCallingWorkSourceUid();
-    void                readRequestHeaders() const;
+    uid_t               readCallingWorkSourceUid() const;
 
 private:
     typedef void        (*release_func)(Parcel* parcel,