Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b5f82d8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 46072d58: am a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."

* commit '46072d58':
  Remove useless 'svcmgr_handle' (which had wrong type).
parents 40191799 46072d58
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -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;