diff options
author | Elliott Hughes <enh@google.com> | 2015-04-06 23:53:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 23:53:49 +0000 |
commit | 62b58afc2127ffde5ba41f23d449f8a148f2d633 (patch) | |
tree | 7ca2ca268efe276b37a8fa7b566b1c2055fdaa8a /cmds | |
parent | 32f0b5b8046667579c0decd3de18d1c2c587e615 (diff) | |
parent | 7b5f82d8d726e4bcd21c19340c0743a728bc0253 (diff) | |
download | frameworks_native-62b58afc2127ffde5ba41f23d449f8a148f2d633.zip frameworks_native-62b58afc2127ffde5ba41f23d449f8a148f2d633.tar.gz frameworks_native-62b58afc2127ffde5ba41f23d449f8a148f2d633.tar.bz2 |
am 7b5f82d8: am 46072d58: am a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
* commit '7b5f82d8d726e4bcd21c19340c0743a728bc0253':
Remove useless 'svcmgr_handle' (which had wrong type).
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; |