summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2020-08-28 17:45:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-28 17:45:34 +0000
commit37ee2bdac07fc9a91535bdbbb5411bfad36e9a52 (patch)
treec56d80fae5872532c66790b13eaf511817d11b4b
parentc822bc7b76771504c3c8149c62bb066d03c43341 (diff)
parent653ae188b00bb34b9ac34a0e67b0f8134d3e33e5 (diff)
downloadnative-37ee2bdac07fc9a91535bdbbb5411bfad36e9a52.tar.gz
Merge "Update language to comply with Android's inclusive language guidance" am: 653ae188b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1413398 Change-Id: I89ab2894def0aee6f5213f28a4f066c524bf8b5d
-rw-r--r--libs/binder/ProcessState.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index ce45b7f517..4f818366d1 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -160,8 +160,8 @@ bool ProcessState::becomeContextManager(context_check_func checkFunc, void* user
if (result != 0) {
android_errorWriteLog(0x534e4554, "121035042");
- int dummy = 0;
- result = ioctl(mDriverFD, BINDER_SET_CONTEXT_MGR, &dummy);
+ int unused = 0;
+ result = ioctl(mDriverFD, BINDER_SET_CONTEXT_MGR, &unused);
}
if (result == -1) {