commit bf0a6e8309839960d3840406b007720146fb954b
author Colin Cross <ccross@android.com> Tue Sep 03 17:15:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 17:15:18 2013 -0700
tree 3fbfd2d771aa9108a6782c398ce49db5d20052cb
parent b6dddf24b8c82ef20aec607ec193d505aa4ea43f
parent d64df296998bcb1528067d7e9adc40cf5e47abd1

am d64df296: am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"

* commit 'd64df296998bcb1528067d7e9adc40cf5e47abd1':
  [GNSS] Add AID_GPS to property user white list

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 322c144..5e7fe89 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -81,6 +81,7 @@
     { "sys.powerctl",     AID_SHELL,    0 },
     { "service.",         AID_SYSTEM,   0 },
     { "wlan.",            AID_SYSTEM,   0 },
+    { "gps.",             AID_GPS,      0 },
     { "bluetooth.",       AID_BLUETOOTH,   0 },
     { "dhcp.",            AID_SYSTEM,   0 },
     { "dhcp.",            AID_DHCP,     0 },
@@ -92,6 +93,7 @@
     { "persist.sys.",     AID_SYSTEM,   0 },
     { "persist.service.", AID_SYSTEM,   0 },
     { "persist.security.", AID_SYSTEM,   0 },
+    { "persist.gps.",      AID_GPS,      0 },
     { "persist.service.bdroid.", AID_BLUETOOTH,   0 },
     { "selinux."         , AID_SYSTEM,   0 },
     { NULL, 0, 0 }