am 2d4cf62a: am 8d9f899a: am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"

* commit '2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9':
  ServiceManager: Print kernel/userspace binder version
This commit is contained in:
Elliott Hughes 2015-04-04 00:39:46 +00:00 committed by Android Git Automerger
commit 177861d98f

View File

@ -113,7 +113,9 @@ struct binder_state *binder_open(size_t mapsize)
if ((ioctl(bs->fd, BINDER_VERSION, &vers) == -1) || if ((ioctl(bs->fd, BINDER_VERSION, &vers) == -1) ||
(vers.protocol_version != BINDER_CURRENT_PROTOCOL_VERSION)) { (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; goto fail_open;
} }