Merge "Update drm service executables file_contexts"
diff --git a/device.mk b/device.mk
index b17fdd7..4ddc38c 100755
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,9 @@
# Enable updating of APEXes
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+# Enable userspace reboot
+$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
+
ifneq (,$(filter 27, $(PRODUCT_EXTRA_VNDK_VERSIONS)))
_vndk_test := true
endif
@@ -45,7 +48,7 @@
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=37
+ ro.vendor.build.svn=38
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b894b3b..3b05b17 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -264,12 +264,6 @@
backlight values -->
<bool name="config_displayBrightnessBucketsInDoze">true</bool>
- <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
- <string name="config_ims_package" translatable="false">org.codeaurora.ims</string>
-
- <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
- <bool name="config_dynamic_bind_ims">true</bool>
-
<!-- Specifies whether to decouple the auto-suspend state of the device from the display on/off state. -->
<bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 297ef38..fdf5efc 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -26,4 +26,10 @@
This is used to support carriers which generate a recording tone to the remote party
when a call recording app is in use. -->
<bool name="config_support_telephony_audio_device">true</bool>
+
+ <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+ <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+
+ <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+ <string name="config_ims_rcs_package">com.android.service.ims</string>
</resources>
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 0953dcb..fd78611 100644
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -36,3 +36,8 @@
# Write to touch vrmode node
allow vendor_init sysfs_touch:file w_file_perms;
+
+# Allow vendor_init to set property of logpersistd_logging_prop
+userdebug_or_eng(`
+ set_prop(vendor_init, logpersistd_logging_prop)
+')
