Merge "Allowing system process to read gpu model" into sepolicy.lnx.6.0
diff --git a/legacy/vendor/common/property_contexts b/legacy/vendor/common/property_contexts
index a0329ee..d3d33ab 100644
--- a/legacy/vendor/common/property_contexts
+++ b/legacy/vendor/common/property_contexts
@@ -34,8 +34,6 @@
ro.vendor.bluetooth. u:object_r:vendor_bluetooth_prop:s0
vendor.ims. u:object_r:qcom_ims_prop:s0
ro.vendor.build.software.version u:object_r:qcom_ims_prop:s0
-persist.vendor.ims.disabled u:object_r:qcom_ims_prop:s0
-vendor.service.qti.ims.enabled u:object_r:qcom_ims_prop:s0
persist.vendor.ims. u:object_r:qcom_ims_prop:s0
persist.vendor.qti.telephony.vt_cam_interface u:object_r:qcom_ims_prop:s0
vendor.hw.fm. u:object_r:fm_prop:s0
diff --git a/qva/vendor/common/ims.te b/qva/vendor/common/ims.te
index d989e9d..51c609d 100644
--- a/qva/vendor/common/ims.te
+++ b/qva/vendor/common/ims.te
@@ -41,7 +41,6 @@
}:file rx_file_perms;
-set_prop(vendor_ims, vendor_qcom_ims_prop)
set_prop(vendor_ims, vendor_ctl_vendor_imsrcsservice_prop)
# Inherit and use open files from radio.
diff --git a/qva/vendor/common/property.te b/qva/vendor/common/property.te
index a2796c5..a4347d3 100644
--- a/qva/vendor/common/property.te
+++ b/qva/vendor/common/property.te
@@ -25,7 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-vendor_internal_prop(vendor_qcom_ims_prop);
vendor_internal_prop(vendor_dataadpl_prop);
vendor_internal_prop(vendor_cnd_vendor_prop);
vendor_internal_prop(vendor_spcomlib_prop);
diff --git a/qva/vendor/common/property_contexts b/qva/vendor/common/property_contexts
index 6957f95..0511f05 100644
--- a/qva/vendor/common/property_contexts
+++ b/qva/vendor/common/property_contexts
@@ -25,8 +25,6 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-persist.vendor.ims.disabled u:object_r:vendor_qcom_ims_prop:s0
-vendor.service.qti.ims.enabled u:object_r:vendor_qcom_ims_prop:s0
ctl.vendor.cnd u:object_r:vendor_cnd_vendor_prop:s0
persist.vendor.cne. u:object_r:vendor_cnd_vendor_prop:s0
persist.vendor.cnd. u:object_r:vendor_cnd_vendor_prop:s0