Remove old Facotry OTA sepolicy setting for B4/S4
Bug: 147270956
Test: Manual
Change-Id: Iab3d4deb97938968be70efeeda4d09be6e4fec73
diff --git a/vendor/qcom/common/factory_ota_app.te b/vendor/qcom/common/factory_ota_app.te
deleted file mode 100644
index 5f2268b..0000000
--- a/vendor/qcom/common/factory_ota_app.te
+++ /dev/null
@@ -1,24 +0,0 @@
-type factory_ota_app, domain, coredomain;
-
-app_domain(factory_ota_app)
-net_domain(factory_ota_app)
-
-# Write to /data/ota_package for OTA packages.
-allow factory_ota_app ota_package_file:dir rw_dir_perms;
-allow factory_ota_app ota_package_file:file create_file_perms;
-
-# Properties
-get_prop(factory_ota_app, factory_ota_prop);
-set_prop(factory_ota_app, exported_system_prop);
-
-# Services
-allow factory_ota_app app_api_service:service_manager find;
-binder_call(factory_ota_app, update_engine) # Allow Factory OTA to call Update Engine
-binder_call(update_engine, factory_ota_app) # Allow Update Engine to call the Factory OTA callback
-allow factory_ota_app update_engine_service:service_manager find;
-allow factory_ota_app nfc_service:service_manager find;
-allow factory_ota_app radio_service:service_manager find;
-
-# b/133124196 For suppress the GPU service seploicy error log which Factory OTA does not need it.
-dontaudit factory_ota_app gpu_service:service_manager find;
-
diff --git a/vendor/qcom/common/hal_nfc_default.te b/vendor/qcom/common/hal_nfc_default.te
index 081430d..8e40bfb 100644
--- a/vendor/qcom/common/hal_nfc_default.te
+++ b/vendor/qcom/common/hal_nfc_default.te
@@ -8,5 +8,5 @@
add_hwservice(hal_nfc_default, nxpnfc_hwservice)
get_prop(hal_nfc_default, vendor_nfc_prop)
-get_prop(hal_nfc_default, factory_ota_prop)
-set_prop(hal_nfc_default, factory_ota_prop)
+get_prop(hal_nfc_default, sota_prop)
+set_prop(hal_nfc_default, sota_prop)
diff --git a/vendor/qcom/common/property.te b/vendor/qcom/common/property.te
index d95b2e4..ea711b3 100644
--- a/vendor/qcom/common/property.te
+++ b/vendor/qcom/common/property.te
@@ -1,6 +1,5 @@
type vendor_camera_prop, property_type;
type cnd_prop, property_type;
-type factory_ota_prop, property_type;
type ims_prop, property_type;
type vendor_ramdump_prop, property_type;
type public_vendor_default_prop, property_type;
diff --git a/vendor/qcom/common/property_contexts b/vendor/qcom/common/property_contexts
index 2530a43..d5100b2 100644
--- a/vendor/qcom/common/property_contexts
+++ b/vendor/qcom/common/property_contexts
@@ -2,9 +2,6 @@
persist.vendor.camera. u:object_r:vendor_camera_prop:s0
persist.camera. u:object_r:vendor_camera_prop:s0
persist.vendor.sys.cnd u:object_r:cnd_prop:s0
-ro.boot.sota u:object_r:factory_ota_prop:s0
-persist.factoryota.reboot u:object_r:exported_system_prop:s0
-persist.vendor.radio.bootwithlpm u:object_r:vendor_radio_prop:s0
vendor.ims. u:object_r:ims_prop:s0
persist.vendor.ims. u:object_r:ims_prop:s0
persist.net.doxlat u:object_r:vendor_net_radio_prop:s0
diff --git a/vendor/qcom/common/rild.te b/vendor/qcom/common/rild.te
index 9c854ed..1f469b5 100644
--- a/vendor/qcom/common/rild.te
+++ b/vendor/qcom/common/rild.te
@@ -30,7 +30,7 @@
allow rild radio_vendor_data_file:dir rw_dir_perms;
allow rild radio_vendor_data_file:file create_file_perms;
-get_prop(rild, factory_ota_prop)
+get_prop(rild, sota_prop)
set_prop(rild, vendor_radio_prop)
# Allow vendor native process to read the proc file of xt_qtaguid
diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts
index b2928ed..f3c98c7 100644
--- a/vendor/qcom/common/seapp_contexts
+++ b/vendor/qcom/common/seapp_contexts
@@ -15,9 +15,6 @@
# A fallback in case tango_core is missing something critical that untrusted_app provides
user=_app seinfo=tango name=com.google.tango:app domain=untrusted_app type=app_data_file levelFrom=user
-# Factory OTA
-user=_app seinfo=platform name=com.google.android.factoryota domain=factory_ota_app levelFrom=all
-
# Hardware Info Collection
user=_app seinfo=platform name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
diff --git a/vendor/qcom/common/vendor_init.te b/vendor/qcom/common/vendor_init.te
index 2eabcdf..dd748bc 100644
--- a/vendor/qcom/common/vendor_init.te
+++ b/vendor/qcom/common/vendor_init.te
@@ -15,7 +15,6 @@
')
set_prop(vendor_init, vendor_camera_prop)
-set_prop(vendor_init, factory_ota_prop)
set_prop(vendor_init, power_prop)
set_prop(vendor_init, public_vendor_default_prop)
set_prop(vendor_init, vendor_bluetooth_prop)
