commit bc54afd65cb03ae205da5adc79171c908a81d999
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 01 20:03:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 01 20:03:18 2020 +0000
tree 654486096128b03f9baa73dcda7f6c55afe7fbde
parent 1fc3167ca5382533003c44e60b61edad4faedc34
parent 4fc5fe688bb4a1ef43a8c9608cf8ed8817090944

Merge "libbinder: fix FATAL_IF_NOT_ONEWAY error" am: 022564e3e7 am: 7abdb705aa am: 4fc5fe688b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1416691

Change-Id: Ifdb6fc405652b6ecd51649f1c8262e9a227a73cd

libs/binder/IPCThreadState.cpp

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 157538e..9aaca65 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -679,7 +679,7 @@
                 CallStack::logStack("non-oneway call", CallStack::getCurrent(10).get(),
                     ANDROID_LOG_ERROR);
             } else /* FATAL_IF_NOT_ONEWAY */ {
-                LOG_ALWAYS_FATAL("Process may not make oneway calls (code: %u).", code);
+                LOG_ALWAYS_FATAL("Process may not make non-oneway calls (code: %u).", code);
             }
         }