diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-17 17:15:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 09:29:29 -0700 |
| commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch) | |
| tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d /init/devices.c | |
| parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff) | |
| parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff) | |
| download | system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.bz2 system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
init/devices.c
libpixelflinger/Android.mk
Diffstat (limited to 'init/devices.c')
| -rw-r--r-- | init/devices.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/devices.c b/init/devices.c index efe3ad03..e0b1f1f3 100644 --- a/init/devices.c +++ b/init/devices.c @@ -123,14 +123,13 @@ static struct perms_ devperms[] = { { "/dev/msm_pcm_ctl", 0660, AID_SYSTEM, AID_AUDIO, 1 }, { "/dev/msm_snd", 0660, AID_SYSTEM, AID_AUDIO, 1 }, { "/dev/msm_mp3", 0660, AID_SYSTEM, AID_AUDIO, 1 }, - { "/dev/msm_snd", 0660, AID_SYSTEM, AID_AUDIO, 1 }, + { "/dev/msm_audpre", 0660, AID_SYSTEM, AID_AUDIO, 0 }, + { "/dev/htc-acoustic", 0660, AID_SYSTEM, AID_AUDIO, 0 }, { "/dev/smd0", 0640, AID_RADIO, AID_RADIO, 0 }, { "/dev/qmi", 0640, AID_RADIO, AID_RADIO, 0 }, { "/dev/qmi0", 0640, AID_RADIO, AID_RADIO, 0 }, { "/dev/qmi1", 0640, AID_RADIO, AID_RADIO, 0 }, { "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 }, - { "/dev/htc-acoustic", 0640, AID_RADIO, AID_RADIO, 0 }, - { "/dev/snd/", 0664, AID_SYSTEM, AID_AUDIO, 1 }, { NULL, 0, 0, 0, 0 }, }; |