summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2010-03-05 12:18:01 -0800
committerGlenn Kasten <gkasten@google.com>2010-03-09 14:16:01 -0800
commit871c16cec850c042c61aa06a7ffc0e1965867bcf (patch)
tree4eb07e9acdcaa01d10d5d3458c2659f715379c34 /cmds
parentc10275abd6a494c93a025f683dde104a5d4f2793 (diff)
downloadframeworks_base-871c16cec850c042c61aa06a7ffc0e1965867bcf.zip
frameworks_base-871c16cec850c042c61aa06a7ffc0e1965867bcf.tar.gz
frameworks_base-871c16cec850c042c61aa06a7ffc0e1965867bcf.tar.bz2
Initial version of LifeVibes integration.
Also changed tabs to spaces in other audioflinger files.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/servicemanager/Android.mk5
-rw-r--r--cmds/servicemanager/service_manager.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 25266a2..392e727 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -10,5 +10,10 @@ include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_SRC_FILES := service_manager.c binder.c
LOCAL_MODULE := servicemanager
+ifeq ($(LVMX),true)
+ ifeq ($(TARGET_ARCH),arm)
+ LOCAL_CFLAGS += -DLVMX
+ endif
+endif
include $(BUILD_EXECUTABLE)
endif
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index f3a4713..a2006c1 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -27,6 +27,9 @@ static struct {
unsigned uid;
const char *name;
} allowed[] = {
+#ifdef LVMX
+ { AID_MEDIA, "com.lifevibes.mx.ipc" },
+#endif
{ AID_MEDIA, "media.audio_flinger" },
{ AID_MEDIA, "media.player" },
{ AID_MEDIA, "media.camera" },