summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueueThreadState.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-06 19:22:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-06 19:22:26 +0000
commit32415facc1b4065151d6e1220bafa5522b53c901 (patch)
tree547b517773c5e857766e1cb0c7f0b69e4669aacd /libs/gui/BufferQueueThreadState.cpp
parenta76acb95584c68f092bcf673b70074fa7417674d (diff)
parent26d0eb321c9b9e3eadb9ba0f1d2ebc7c6272e98e (diff)
Merge "Remove need for libbinderthreadstate." am: 26d0eb321c
Change-Id: Ie8b7ae5f915ef5da968cebc98653cdcacb07d465
Diffstat (limited to 'libs/gui/BufferQueueThreadState.cpp')
-rw-r--r--libs/gui/BufferQueueThreadState.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/gui/BufferQueueThreadState.cpp b/libs/gui/BufferQueueThreadState.cpp
index 3b531ec752..c13030b1ed 100644
--- a/libs/gui/BufferQueueThreadState.cpp
+++ b/libs/gui/BufferQueueThreadState.cpp
@@ -15,6 +15,7 @@
*/
#include <binder/IPCThreadState.h>
+#include <binderthreadstate/CallerUtils.h>
#include <hwbinder/IPCThreadState.h>
#include <private/gui/BufferQueueThreadState.h>
#include <unistd.h>
@@ -22,14 +23,14 @@
namespace android {
uid_t BufferQueueThreadState::getCallingUid() {
- if (hardware::IPCThreadState::self()->isServingCall()) {
+ if (getCurrentServingCall() == BinderCallType::HWBINDER) {
return hardware::IPCThreadState::self()->getCallingUid();
}
return IPCThreadState::self()->getCallingUid();
}
pid_t BufferQueueThreadState::getCallingPid() {
- if (hardware::IPCThreadState::self()->isServingCall()) {
+ if (getCurrentServingCall() == BinderCallType::HWBINDER) {
return hardware::IPCThreadState::self()->getCallingPid();
}
return IPCThreadState::self()->getCallingPid();