commit 218d4e6ce524c2825f545fec61fd97c81314248e
author Colin Cross <ccross@android.com> Mon Oct 24 18:06:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 18:06:24 2016 +0000
tree b6c793d0468781e38741277080fd81685f596fe2
parent 7a7c28a4aa032072c80f825f35ee4dd3198f30ac
parent 3a3ed21bacd363b30e574c2b802ff54e389b914b

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

Change-Id: I155907b463d85dee5327c1b1df47be6d6c5cc3c9

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