From 7d96ddbfb0b2e34c79b921538bebcaaf35c988ff Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Fri, 31 Jul 2020 21:12:54 +0900
Subject: [PATCH] Remove exported2_system_prop

It's not used anymore.

Bug: 161659925
Test: boot
Change-Id: I5b08bdace28a509d464759a66025c951178225c6
---
 private/compat/30.0/30.0.cil | 1 +
 private/domain.te            | 2 --
 private/healthd.te           | 1 -
 private/property.te          | 2 --
 private/system_app.te        | 1 -
 private/system_server.te     | 1 -
 public/property.te           | 1 -
 public/vendor_init.te        | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index e13c2898b..44d7535a6 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 7735ad78e..ee998eb65 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -74,14 +74,12 @@ get_prop(domain, bq_config_prop);
 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 921d33ff9..93bc3d8fc 100644
--- a/private/healthd.te
+++ b/private/healthd.te
@@ -9,5 +9,4 @@ hal_server_domain(healthd, hal_health)
 # 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 7b821e020..48b94534b 100644
--- a/private/property.te
+++ b/private/property.te
@@ -140,7 +140,6 @@ compatible_property_only(`
     exported_default_prop
     exported_dumpstate_prop
     exported_system_prop
-    exported2_system_prop
     exported3_system_prop
     usb_control_prop
     -nfc_prop
@@ -235,7 +234,6 @@ compatible_property_only(`
     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 5a2a561ae..a9d73dbc3 100644
--- a/private/system_app.te
+++ b/private/system_app.te
@@ -44,7 +44,6 @@ set_prop(system_app, debug_prop)
 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 0622908bc..e6b73b7ea 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -599,7 +599,6 @@ allow system_server server_configurable_flags_data_file:file r_file_perms;
 # 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 a3a26f91b..3b4e368be 100644
--- a/public/property.te
+++ b/public/property.te
@@ -167,7 +167,6 @@ system_public_prop(dalvik_runtime_prop)
 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 cd1521d4a..7625c4d04 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -219,7 +219,6 @@ set_prop(vendor_init, exported_config_prop)
 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)