commit 4e110b25fc97c30dcc3424960786c1bbd51bdede
author Colin Cross <ccross@android.com> Mon Oct 24 18:13:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 18:13:54 2016 +0000
tree 3bf2c78d3540b008fc727c92a86ef81c762d679d
parent 5ae30bd3cfa1c3ded23efc2f678a4fb9738b01e7
parent 22e91a5b8fa06c11b23826fb17570ce5a345d7ee

Merge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac am: 218d4e6ce5
am: 22e91a5b8f

Change-Id: Ief9ebb3d80d134d964a3011141da0196c16f87fd

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