Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-sam

Bug: 205056467
Merged-In: I83cf7b45d6e4146d112a3bed08a5fd5a4f5089ce
Change-Id: Ib4c2882c506f8c3f35dc2d5616f4986ee30cfdcb

6 files changed, 14 insertions, 0 deletions

diff --git a/sunfish-sepolicy.mk b/sunfish-sepolicy.mk
index 17abc57..d408696 100644
--- a/sunfish-sepolicy.mk
+++ b/sunfish-sepolicy.mk
@@ -9,6 +9,9 @@ BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/tracking_denials
 BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/st
 BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/verizon
 
+# system_ext
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish-sepolicy/system_ext/private
+
 # Pixel-wide sepolicy
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/wifi_sniffer
 BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
diff --git a/system_ext/private/platform_app.te b/system_ext/private/platform_app.te
new file mode 100644
index 0000000..10d6bba
--- /dev/null
+++ b/system_ext/private/platform_app.te
@@ -0,0 +1,2 @@
+# allow systemui to set boot animation colors
+set_prop(platform_app, bootanim_system_prop);
diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts
new file mode 100644
index 0000000..abcdd41
--- /dev/null
+++ b/system_ext/private/property_contexts
@@ -0,0 +1,5 @@
+# Boot animation dynamic colors
+persist.bootanim.color1     u:object_r:bootanim_system_prop:s0     exact    int
+persist.bootanim.color2     u:object_r:bootanim_system_prop:s0     exact    int
+persist.bootanim.color3     u:object_r:bootanim_system_prop:s0     exact    int
+persist.bootanim.color4     u:object_r:bootanim_system_prop:s0     exact    int
diff --git a/vendor/qcom/common/hal_rcsservice.te b/vendor/qcom/common/hal_rcsservice.te
index 9acd706..0c95f16 100644
--- a/vendor/qcom/common/hal_rcsservice.te
+++ b/vendor/qcom/common/hal_rcsservice.te
@@ -11,6 +11,8 @@ hwbinder_use(hal_rcsservice)
 # add IUceSerive and IService to Hidl interface
 add_hwservice(hal_rcsservice, hal_imsrcsd_hwservice)
 add_hwservice(hal_rcsservice, hal_imscallinfo_hwservice)
+# add imsfactory to HIDl interface
+add_hwservice(hal_rcsservice, hal_imsfactory_hwservice)
 
 get_prop(hal_rcsservice, hwservicemanager_prop)
 set_prop(hal_rcsservice, qcom_ims_prop)
diff --git a/vendor/qcom/common/hwservice.te b/vendor/qcom/common/hwservice.te
index 5f091a5..c17da13 100644
--- a/vendor/qcom/common/hwservice.te
+++ b/vendor/qcom/common/hwservice.te
@@ -22,3 +22,4 @@ type hal_cacert_hwservice, hwservice_manager_type, vendor_hwservice_type;
 type hal_capabilityconfigstore_qti_hwservice, hwservice_manager_type, vendor_hwservice_type;
 type hal_qseecom_hwservice, hwservice_manager_type, protected_hwservice, vendor_hwservice_type;
 type hal_mwqemadapter_hwservice, hwservice_manager_type, protected_hwservice;
+type hal_imsfactory_hwservice, hwservice_manager_type, protected_hwservice, vendor_hwservice_type;
diff --git a/vendor/qcom/common/hwservice_contexts b/vendor/qcom/common/hwservice_contexts
index ed11eb4..d6d205b 100644
--- a/vendor/qcom/common/hwservice_contexts
+++ b/vendor/qcom/common/hwservice_contexts
@@ -28,6 +28,7 @@ vendor.qti.hardware.tui_comm::ITuiComm                                  u:object
 vendor.qti.hardware.radio.atcmdfwd::IAtCmdFwd                           u:object_r:vnd_atcmdfwd_hwservice:s0
 vendor.qti.hardware.data.latency::ILinkLatency                          u:object_r:hal_latency_hwservice:s0
 vendor.qti.data.factory::IFactory                                       u:object_r:hal_datafactory_hwservice:s0
+vendor.qti.ims.factory::IImsFactory                                     u:object_r:hal_imsfactory_hwservice:s0
 vendor.qti.imsrtpservice::IRTPService                                   u:object_r:hal_imsrtp_hwservice:s0
 vendor.qti.hardware.cacert::IService                                    u:object_r:hal_cacert_hwservice:s0
 hardware.google.media.c2::IConfigurable                                 u:object_r:hal_codec2_hwservice:s0