Merge "service_manager: duplicate registrations override previous ones"

2010-12-08 18:40:43 -08:00
parent 19f5a91e92 1d8843897e
commit 324c31622b
1 changed files with 2 additions and 2 deletions
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -161,9 +161,9 @@ int do_add_service(struct binder_state *bs,
    si = find_svc(s, len);
    if (si) {
        if (si->ptr) {
-            LOGE("add_service('%s',%p) uid=%d - ALREADY REGISTERED\n",
+            LOGE("add_service('%s',%p) uid=%d - ALREADY REGISTERED, OVERRIDE\n",
                 str8(s), ptr, uid);
-            return -1;
+            svcinfo_death(bs, si);
        }
        si->ptr = ptr;
    } else {