From 9c6749d772ab46a303eead37631c4154431020fd Mon Sep 17 00:00:00 2001
From: Jeffrey Vander Stoep <jeffv@google.com>
Date: Fri, 4 May 2018 06:23:42 +0000
Subject: [PATCH] Revert "FrameworksServicesTests: allow access to
test.sys.boot.reason property"
This reverts commit 0ab13a8dffa2cd92b895d30252149c1f007e2dc3.
Reason for revert: broken presubmit tests
https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=83e847b2-8e30-4417-9b15-8e66af4b2bc3&target=DeviceBootTest
Change-Id: Id173c8e7fa28ba04070f507098f301f076e4aae7
---
private/compat/26.0/26.0.ignore.cil | 1 -
private/compat/27.0/27.0.ignore.cil | 1 -
private/platform_app.te | 3 ---
private/property_contexts | 1 -
public/property.te | 1 -
5 files changed, 7 deletions(-)
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index e5eb3b25a..42071c9a4 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -98,7 +98,6 @@
system_boot_reason_prop
system_net_netd_hwservice
system_update_service
- test_prop
thermal_service
thermalcallback_hwservice
thermalserviced
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index e56e77bcd..d74139a0c 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -82,7 +82,6 @@
storaged_data_file
system_boot_reason_prop
system_update_service
- test_prop
tombstone_wifi_data_file
trace_data_file
traced
diff --git a/private/platform_app.te b/private/platform_app.te
index b52646224..b147bd9c2 100644
--- a/private/platform_app.te
+++ b/private/platform_app.te
@@ -77,9 +77,6 @@ read_runtime_log_tags(platform_app)
allow platform_app system_server:udp_socket {
connect getattr read recvfrom sendto write getopt setopt };
-# allow platform apps to connect to the property service
-set_prop(platform_app, test_prop)
-
###
### Neverallow rules
###
diff --git a/private/property_contexts b/private/property_contexts
index d61b48cdb..4433bdf7d 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -71,7 +71,6 @@ ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0
persist.sys.boot.reason u:object_r:last_boot_reason_prop:s0
sys.boot.reason u:object_r:system_boot_reason_prop:s0
pm. u:object_r:pm_prop:s0
-test. u:object_r:test_prop:s0
# Boolean property set by system server upon boot indicating
# if device owner is provisioned.
diff --git a/public/property.te b/public/property.te
index ee0031d5d..5dd88dccb 100644
--- a/public/property.te
+++ b/public/property.te
@@ -51,7 +51,6 @@ type shell_prop, property_type, core_property_type;
type system_boot_reason_prop, property_type;
type system_prop, property_type, core_property_type;
type system_radio_prop, property_type, core_property_type;
-type test_prop, property_type;
type traced_enabled_prop, property_type;
type vold_prop, property_type, core_property_type;
type wifi_log_prop, property_type, log_property_type;
--
GitLab