summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-05-19 12:52:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-19 12:52:17 +0000
commit7e72d990aff9cc9152c534678417b9e5448e0e42 (patch)
tree4cb6a3a79b16a2543812fba337fa374356f44a94
parent0a0b640f50af77215f2c0db9695c6a3494ad1dd3 (diff)
parent0f54ada1cd4605e29cc86ee37fe7843b1d98db9b (diff)
downloadbuild-7e72d990aff9cc9152c534678417b9e5448e0e42.zip
build-7e72d990aff9cc9152c534678417b9e5448e0e42.tar.gz
build-7e72d990aff9cc9152c534678417b9e5448e0e42.tar.bz2
Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev
-rw-r--r--target/board/generic/sepolicy/goldfish_setup.te7
-rw-r--r--target/board/generic/sepolicy/property.te1
-rw-r--r--target/board/generic/sepolicy/property_contexts1
3 files changed, 9 insertions, 0 deletions
diff --git a/target/board/generic/sepolicy/goldfish_setup.te b/target/board/generic/sepolicy/goldfish_setup.te
index c4fe9d6..3fb79e7 100644
--- a/target/board/generic/sepolicy/goldfish_setup.te
+++ b/target/board/generic/sepolicy/goldfish_setup.te
@@ -15,3 +15,10 @@ allow goldfish_setup self:udp_socket create_socket_perms;
# Set net.eth0.dns*, debug.sf.nobootanimation
set_prop(goldfish_setup, system_prop)
set_prop(goldfish_setup, debug_prop)
+
+# Set ro.radio.noril
+set_prop(goldfish_setup, radio_noril_prop)
+
+# Stop ril-daemon service (by setting ctl.stop to ril-daemon, which
+# transforms to a permission check on ctl.ril-daemon).
+set_prop(goldfish_setup, ctl_rildaemon_prop)
diff --git a/target/board/generic/sepolicy/property.te b/target/board/generic/sepolicy/property.te
index b3d15f8..b316d08 100644
--- a/target/board/generic/sepolicy/property.te
+++ b/target/board/generic/sepolicy/property.te
@@ -1 +1,2 @@
type qemu_prop, property_type;
+type radio_noril_prop, property_type;
diff --git a/target/board/generic/sepolicy/property_contexts b/target/board/generic/sepolicy/property_contexts
index 5f741f8..09b9b06 100644
--- a/target/board/generic/sepolicy/property_contexts
+++ b/target/board/generic/sepolicy/property_contexts
@@ -1 +1,2 @@
qemu. u:object_r:qemu_prop:s0
+radio.noril u:object_r:radio_noril_prop:s0