summaryrefslogtreecommitdiff
path: root/libs/binder/ProcessState.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-05-05 18:23:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-05-05 18:23:33 +0000
commit92ffb4885f5da471a52481820357a63bdbe369da (patch)
treedcfb31b8d1f0560e8fb3b9b7525510614f9ddaf9 /libs/binder/ProcessState.cpp
parent1c451ac31ef90ae22813d374bc6406d94116e8c4 (diff)
parent17078c14b95d8dbad70aaab0d76b22b409d56086 (diff)
Merge changes I6c715612,If84ff928 am: 2281985cd3 am: e5ab8b3709 am: 17078c14b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1696388 Change-Id: Ib94c51b4341379912e99cd5d96b741a9cc49f350
Diffstat (limited to 'libs/binder/ProcessState.cpp')
-rw-r--r--libs/binder/ProcessState.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 1d3beb4736..4fd0dc7715 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -27,8 +27,8 @@
#include <utils/String8.h>
#include <utils/threads.h>
-#include <private/binder/binder_module.h>
#include "Static.h"
+#include "binder_module.h"
#include <errno.h>
#include <fcntl.h>