commit f2e4d7ff0308171d63e4c133e8769b0dba304ece
author Jeff Sharkey <jsharkey@android.com> Wed Aug 08 10:45:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 08 10:45:05 2012 -0700
tree 4e00fa8d0c434c7f38bb2b4a12355309d89a5391
parent a8afd723a4bdd68eda34a552a472a6adc0c26369
parent 9509d27252b16f69b6fd2ebb2c552201c34e5c0c

Merge "Native utils for working with user and app IDs." into jb-mr1-dev

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
old mode 100644
new mode 100755
index 4ee86c0..b092077
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -87,6 +87,7 @@
     { "persist.sys.",     AID_SYSTEM,   0 },
     { "persist.service.", AID_SYSTEM,   0 },
     { "persist.security.", AID_SYSTEM,   0 },
+    { "persist.service.bdroid.", AID_BLUETOOTH,   0 },
     { NULL, 0, 0 }
 };
 

init/ueventd.c

diff --git a/init/ueventd.c b/init/ueventd.c
index a89e067..a41c31e 100644
--- a/init/ueventd.c
+++ b/init/ueventd.c
@@ -105,7 +105,7 @@
     for (i = 0; i < ARRAY_SIZE(android_ids); i++)
         if (!strcmp(id, android_ids[i].name))
             return android_ids[i].aid;
-    return 0;
+    return -1;
 }
 
 void set_device_permission(int nargs, char **args)

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 22e5e0a..c7063b5 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -150,6 +150,8 @@
     chmod 0440 /proc/kmsg
     chown root system /proc/sysrq-trigger
     chmod 0220 /proc/sysrq-trigger
+    chown system log /proc/last_kmsg
+    chmod 0440 /proc/last_kmsg
 
     # create the lost+found directories, so as to enforce our permissions
     mkdir /cache/lost+found 0770 root root