diff options
| author | 2019-09-06 14:37:52 -0700 | |
|---|---|---|
| committer | 2019-09-06 14:37:52 -0700 | |
| commit | 0539cf0d16d28a184a4a84f086311a5d62f84872 (patch) | |
| tree | 2e8c27bf9013190406cae080f482a8c225fe1b5c | |
| parent | 47dfce7fbf07849ae7416660c7378431cde94512 (diff) | |
| parent | 7b3d64ef88baa7ce53cbfb689259d441928a3790 (diff) | |
Merge changes Ia43d6dae,I09ec7969 am: f03997b7f2 am: 6f99af7209
am: 7b3d64ef88
Change-Id: I5be8a1923b1f75872c3040f5187e9be96edc3cf1
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 8751ecbf70..ed6c834af8 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -541,7 +541,7 @@ bool Parcel::replaceCallingWorkSourceUid(uid_t uid) return err == NO_ERROR; } -uid_t Parcel::readCallingWorkSourceUid() +uid_t Parcel::readCallingWorkSourceUid() const { if (!mRequestHeaderPresent) { return IPCThreadState::kUnsetWorkSource; diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index 0a4f9063c2..518c0832c4 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -377,8 +377,7 @@ public: 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, |