commit 588d2bdefe0d8a4ff3a5ad45afe1806aee022762
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 15 19:04:49 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 15 19:04:49 2009 -0700
tree 56e753ee1256702c3f13fcf77fd7d7251cb9daa2
parent 6b840e9b61a22ca9644fd9afa90e5a0f4d242b44
parent d1f57e689b703faa46d26decb1758a6f0330e9ec

Merge change 7495

* changes:
  Improve error handling

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 4c7b7da..720b913 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -100,7 +100,7 @@
     { "/dev/android_adb_enable",   0660,   AID_ADB,        AID_ADB,        0 },
     { "/dev/ttyMSM0",       0600,   AID_BLUETOOTH,  AID_BLUETOOTH,  0 },
     { "/dev/ttyHS0",        0600,   AID_BLUETOOTH,  AID_BLUETOOTH,  0 },
-    { "/dev/uinput",        0600,   AID_BLUETOOTH,  AID_BLUETOOTH,  0 },
+    { "/dev/uinput",        0660,   AID_SYSTEM,     AID_BLUETOOTH,  0 },
     { "/dev/alarm",         0664,   AID_SYSTEM,     AID_RADIO,      0 },
     { "/dev/tty0",          0660,   AID_ROOT,       AID_SYSTEM,     0 },
     { "/dev/graphics/",     0660,   AID_ROOT,       AID_GRAPHICS,   1 },

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 799995a..1f39433 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -287,6 +287,12 @@
     disabled
     oneshot
 
+service opush /system/bin/sdptool add --channel=12 OPUSH
+    user bluetooth
+    group bluetooth net_bt_admin
+    disabled
+    oneshot
+
 service installd /system/bin/installd
     socket installd stream 600 system system