summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-27 16:29:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 16:29:33 -0700
commit2a36a778d384403cd92b1016ed5c860d3f2c3521 (patch)
treee46cf861b3b921aba3913cb4158fba4d2744559c /cmds
parent4e9243d55ce183542c74550e503ea583643599a0 (diff)
parent68ef7f3c3a8deb0e14b0b6325876b23cecc191b3 (diff)
downloadframeworks_base-2a36a778d384403cd92b1016ed5c860d3f2c3521.zip
frameworks_base-2a36a778d384403cd92b1016ed5c860d3f2c3521.tar.gz
frameworks_base-2a36a778d384403cd92b1016ed5c860d3f2c3521.tar.bz2
am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp * commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3': Move SipService out of SystemServer to phone process.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/servicemanager/service_manager.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index a57a72f..d380a27 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -42,6 +42,7 @@ static struct {
{ AID_RADIO, "radio.simphonebook" },
/* TODO: remove after phone services are updated: */
{ AID_RADIO, "phone" },
+ { AID_RADIO, "sip" },
{ AID_RADIO, "isms" },
{ AID_RADIO, "iphonesubinfo" },
{ AID_RADIO, "simphonebook" },