summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-04 00:39:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-04 00:39:46 +0000
commit177861d98f0a44bb94c6d9a2fed176fa4a226dbf (patch)
tree12b3c3b311d02e9ca566ff24443d266129e0adec /cmds
parent5bbd68d6447c532a76aaa5a5d811a48f55ff18f3 (diff)
parent2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9 (diff)
downloadframeworks_native-177861d98f0a44bb94c6d9a2fed176fa4a226dbf.zip
frameworks_native-177861d98f0a44bb94c6d9a2fed176fa4a226dbf.tar.gz
frameworks_native-177861d98f0a44bb94c6d9a2fed176fa4a226dbf.tar.bz2
am 2d4cf62a: am 8d9f899a: am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"
* commit '2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9': ServiceManager: Print kernel/userspace binder version
Diffstat (limited to 'cmds')
-rw-r--r--cmds/servicemanager/binder.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/servicemanager/binder.c b/cmds/servicemanager/binder.c
index d1ab05f..6eecee1 100644
--- a/cmds/servicemanager/binder.c
+++ b/cmds/servicemanager/binder.c
@@ -113,7 +113,9 @@ struct binder_state *binder_open(size_t mapsize)
if ((ioctl(bs->fd, BINDER_VERSION, &vers) == -1) ||
(vers.protocol_version != BINDER_CURRENT_PROTOCOL_VERSION)) {
- fprintf(stderr, "binder: driver version differs from user space\n");
+ fprintf(stderr,
+ "binder: kernel driver version (%d) differs from user space version (%d)\n",
+ vers.protocol_version, BINDER_CURRENT_PROTOCOL_VERSION);
goto fail_open;
}