Remove exported2_system_prop
It's not used anymore.
Bug: 161659925
Test: boot
Change-Id: I5b08bdace28a509d464759a66025c951178225c6
Merged-In: I5b08bdace28a509d464759a66025c951178225c6
(cherry picked from commit 7d96ddbfb0b2e34c79b921538bebcaaf35c988ff)
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index e13c289..44d7535 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -10,6 +10,7 @@
(type exported2_config_prop)
(type exported2_default_prop)
(type exported2_radio_prop)
+(type exported2_system_prop)
(type exported2_vold_prop)
(type exported3_default_prop)
(type exported3_radio_prop)
diff --git a/private/domain.te b/private/domain.te
index 6581b11..a4abe53 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -74,14 +74,12 @@
not_compatible_property(`
# DO NOT ADD ANY PROPERTIES HERE
get_prop(domain, core_property_type)
- get_prop(domain, exported2_system_prop)
get_prop(domain, exported3_system_prop)
get_prop(domain, vendor_default_prop)
')
compatible_property_only(`
# DO NOT ADD ANY PROPERTIES HERE
get_prop({coredomain appdomain shell}, core_property_type)
- get_prop({coredomain appdomain shell}, exported2_system_prop)
get_prop({coredomain appdomain shell}, exported3_system_prop)
get_prop({coredomain appdomain shell}, exported_camera_prop)
get_prop({coredomain shell}, userspace_reboot_exported_prop)
diff --git a/private/healthd.te b/private/healthd.te
index 921d33f..93bc3d8 100644
--- a/private/healthd.te
+++ b/private/healthd.te
@@ -9,5 +9,4 @@
# process when running in charger mode.
set_prop(healthd, system_prop)
set_prop(healthd, exported_system_prop)
-set_prop(healthd, exported2_system_prop)
set_prop(healthd, exported3_system_prop)
diff --git a/private/property.te b/private/property.te
index a068799..d62ea9c 100644
--- a/private/property.te
+++ b/private/property.te
@@ -140,7 +140,6 @@
exported_default_prop
exported_dumpstate_prop
exported_system_prop
- exported2_system_prop
exported3_system_prop
usb_control_prop
-nfc_prop
@@ -235,7 +234,6 @@
core_property_type
dalvik_config_prop
extended_core_property_type
- exported2_system_prop
exported3_system_prop
systemsound_config_prop
-debug_prop
diff --git a/private/system_app.te b/private/system_app.te
index a052f1d..9298937 100644
--- a/private/system_app.te
+++ b/private/system_app.te
@@ -44,7 +44,6 @@
set_prop(system_app, system_prop)
set_prop(system_app, exported_bluetooth_prop)
set_prop(system_app, exported_system_prop)
-set_prop(system_app, exported2_system_prop)
set_prop(system_app, exported3_system_prop)
set_prop(system_app, logd_prop)
set_prop(system_app, net_radio_prop)
diff --git a/private/system_server.te b/private/system_server.te
index 5382508..23b710a 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -599,7 +599,6 @@
# Property Service write
set_prop(system_server, system_prop)
set_prop(system_server, exported_system_prop)
-set_prop(system_server, exported2_system_prop)
set_prop(system_server, exported3_system_prop)
set_prop(system_server, safemode_prop)
set_prop(system_server, theme_prop)
diff --git a/public/property.te b/public/property.te
index c245ee4..3c913b1 100644
--- a/public/property.te
+++ b/public/property.te
@@ -165,7 +165,6 @@
system_public_prop(debug_prop)
system_public_prop(dumpstate_options_prop)
system_public_prop(exported_system_prop)
-system_public_prop(exported2_system_prop)
system_public_prop(exported_bluetooth_prop)
system_public_prop(exported_overlay_prop)
system_public_prop(exported_pm_prop)
diff --git a/public/vendor_init.te b/public/vendor_init.te
index c0f81ef..a7de93f 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -219,7 +219,6 @@
set_prop(vendor_init, exported_default_prop)
set_prop(vendor_init, exported_overlay_prop)
set_prop(vendor_init, exported_pm_prop)
-set_prop(vendor_init, exported2_system_prop)
set_prop(vendor_init, ffs_control_prop)
set_prop(vendor_init, incremental_prop)
set_prop(vendor_init, lmkd_prop)