summaryrefslogtreecommitdiffstats
path: root/cmds/servicemanager/service_manager.c
diff options
context:
space:
mode:
authorSerban Constantinescu <serban.constantinescu@arm.com>2014-01-10 13:56:27 +0000
committerDavid Butcher <david.butcher@arm.com>2014-01-31 10:20:49 +0000
commitbcf38880c65297da58194eb0c0ce8d6e2bab7d94 (patch)
tree5d3954ab5a79ffa2c96ba60c6325599666714bc3 /cmds/servicemanager/service_manager.c
parentaf3efe8ce7e2eeb7a98552af5cf38d8a9720f018 (diff)
downloadframeworks_native-bcf38880c65297da58194eb0c0ce8d6e2bab7d94.zip
frameworks_native-bcf38880c65297da58194eb0c0ce8d6e2bab7d94.tar.gz
frameworks_native-bcf38880c65297da58194eb0c0ce8d6e2bab7d94.tar.bz2
ServiceManager: Make use of kernel exported structures
This patch switches ServiceManager to use the structures exported in the kernel headers rather then redefining its own. struct binder_txn is replaced with struct binder_transaction_data and struct binder_object with struct flat_binder_object, both defined in the binder driver header <linux/binder.h>. Change-Id: I3b3e97918173ea35a289e184774ae06193192da3 Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Diffstat (limited to 'cmds/servicemanager/service_manager.c')
-rw-r--r--cmds/servicemanager/service_manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 3eaf1eb..3625e29 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -201,7 +201,7 @@ int do_add_service(struct binder_state *bs,
}
int svcmgr_handler(struct binder_state *bs,
- struct binder_txn *txn,
+ struct binder_transaction_data *txn,
struct binder_io *msg,
struct binder_io *reply)
{
@@ -215,7 +215,7 @@ int svcmgr_handler(struct binder_state *bs,
// ALOGI("target=%p code=%d pid=%d uid=%d\n",
// txn->target, txn->code, txn->sender_pid, txn->sender_euid);
- if (txn->target != svcmgr_handle)
+ if (txn->target.handle != svcmgr_handle)
return -1;
// Equivalent to Parcel::enforceInterface(), reading the RPC