commit 3a3ed21bacd363b30e574c2b802ff54e389b914b
author Colin Cross <ccross@android.com> Mon Oct 24 18:02:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 18:02:53 2016 +0000
tree 133ecebd9c9dce96d645f303eaf0256d76c4c00e
parent 439dbe3bc3c14533c6309b5134173bd1ac7bd27a
parent a3408388959075581d574112a8c492b85bf50bab

Merge "[binder]: Correct the index for getReturnString"
am: a340838895

Change-Id: Ide173ea019cceaba9eee1c25edf9fea75acc6caa

libs/binder/IPCThreadState.cpp

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 5d44d54..c9f688f 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -107,8 +107,9 @@
     "BC_DEAD_BINDER_DONE"
 };
 
-static const char* getReturnString(size_t idx)
+static const char* getReturnString(uint32_t cmd)
 {
+    size_t idx = cmd & 0xff;
     if (idx < sizeof(kReturnStrings) / sizeof(kReturnStrings[0]))
         return kReturnStrings[idx];
     else