diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-03 16:51:18 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-03 22:46:56 -0700 |
| commit | 0b41ad5d6ec86cd2d481969dcff7e88f2805324f (patch) | |
| tree | ae23b766c9614c73ac45ed08b0bbeebed0431db7 /cmds | |
| parent | 1e954441d22d0feb28caceee9fe14bc7729b7b90 (diff) | |
| download | frameworks_native-0b41ad5d6ec86cd2d481969dcff7e88f2805324f.zip frameworks_native-0b41ad5d6ec86cd2d481969dcff7e88f2805324f.tar.gz frameworks_native-0b41ad5d6ec86cd2d481969dcff7e88f2805324f.tar.bz2 | |
Remove useless 'svcmgr_handle' (which had wrong type).
Also use the 'ptr' union member rather than 'handle'.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Change-Id: I68e5336cd3af3bc61dbddd2b33d7e1512c0c329c
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/servicemanager/service_manager.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c index 0abdf83..cacfe14 100644 --- a/cmds/servicemanager/service_manager.c +++ b/cmds/servicemanager/service_manager.c @@ -3,6 +3,7 @@ #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -22,8 +23,6 @@ #include <cutils/log.h> #endif -uint32_t svcmgr_handle; - const char *str8(const uint16_t *x, size_t x_len) { static char buf[128]; @@ -254,10 +253,10 @@ int svcmgr_handler(struct binder_state *bs, uint32_t strict_policy; int allow_isolated; - //ALOGI("target=%x code=%d pid=%d uid=%d\n", - // txn->target.handle, txn->code, txn->sender_pid, txn->sender_euid); + //ALOGI("target=%p code=%d pid=%d uid=%d\n", + // (void*) txn->target.ptr, txn->code, txn->sender_pid, txn->sender_euid); - if (txn->target.handle != svcmgr_handle) + if (txn->target.ptr != BINDER_SERVICE_MANAGER) return -1; if (txn->code == PING_TRANSACTION) @@ -381,7 +380,6 @@ int main(int argc, char **argv) cb.func_log = selinux_log_callback; selinux_set_callback(SELINUX_CB_LOG, cb); - svcmgr_handle = BINDER_SERVICE_MANAGER; binder_loop(bs, svcmgr_handler); return 0; |