summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-09-03 17:13:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-03 17:13:35 -0700
commitd64df296998bcb1528067d7e9adc40cf5e47abd1 (patch)
tree729806e9e36da8362047229d1a96f6f630505459
parenta9f6cc54e7330a03e55291bda1d75bc78f3f8f2a (diff)
parent9dd40e9756de23a25aaa9909c8d4055105621a76 (diff)
downloadsystem_core-d64df296998bcb1528067d7e9adc40cf5e47abd1.zip
system_core-d64df296998bcb1528067d7e9adc40cf5e47abd1.tar.gz
system_core-d64df296998bcb1528067d7e9adc40cf5e47abd1.tar.bz2
am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit '9dd40e9756de23a25aaa9909c8d4055105621a76': [GNSS] Add AID_GPS to property user white list
-rw-r--r--init/property_service.c2
1 files changed, 2 insertions, 0 deletions
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 @@ struct {
{ "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 @@ struct {
{ "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 }