diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-06 23:13:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-06 23:13:32 +0000 |
| commit | a60ff367a4f55ea319625cf500687c5025604f40 (patch) | |
| tree | b3f25e217b1710c6fdee4ce99ef38f15cee57c14 /cmds/servicemanager | |
| parent | 031fec0b9da7f5985c5a1650ed570ca3872e63c0 (diff) | |
| parent | 0b41ad5d6ec86cd2d481969dcff7e88f2805324f (diff) | |
| download | frameworks_native-a60ff367a4f55ea319625cf500687c5025604f40.zip frameworks_native-a60ff367a4f55ea319625cf500687c5025604f40.tar.gz frameworks_native-a60ff367a4f55ea319625cf500687c5025604f40.tar.bz2 | |
Merge "Remove useless 'svcmgr_handle' (which had wrong type)."
Diffstat (limited to 'cmds/servicemanager')
| -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; |