Merge changes from topic "kernel5_revision" into main
* changes:
sepolicy: gs101: fix bm selinux
sepolicy: remove dump_gs101.sh
sepolicy: remove duplicate policy
diff --git a/display/gs101/genfs_contexts b/display/gs101/genfs_contexts
index 99badab..6144af6 100644
--- a/display/gs101/genfs_contexts
+++ b/display/gs101/genfs_contexts
@@ -2,12 +2,14 @@
genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/panel_name u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/serial_number u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/refresh_rate u:object_r:sysfs_display:s0
+genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/power_state u:object_r:sysfs_display:s0
genfscon sysfs /firmware/devicetree/base/drmdsim@0x1C2C0000/panel@0/compatible u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/backlight u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/panel_name u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/serial_number u:object_r:sysfs_display:s0
genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/refresh_rate u:object_r:sysfs_display:s0
+genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/power_state u:object_r:sysfs_display:s0
genfscon sysfs /firmware/devicetree/base/drmdsim@0x1C2D0000/panel@0/compatible u:object_r:sysfs_display:s0
genfscon sysfs /module/drm/parameters/vblankoffdelay u:object_r:sysfs_display:s0
diff --git a/whitechapel/vendor/google/hal_camera_default.te b/whitechapel/vendor/google/hal_camera_default.te
index b488860..5697afe 100644
--- a/whitechapel/vendor/google/hal_camera_default.te
+++ b/whitechapel/vendor/google/hal_camera_default.te
@@ -91,6 +91,7 @@
# Allow camera HAL to read backlight of display
allow hal_camera_default sysfs_leds:dir r_dir_perms;
allow hal_camera_default sysfs_leds:file r_file_perms;
+allow hal_camera_default sysfs_display:file r_file_perms;
# Allow camera HAL to query interrupts and set interrupt affinity
allow hal_camera_default proc_irq:dir r_dir_perms;
diff --git a/whitechapel/vendor/google/hal_radioext_default.te b/whitechapel/vendor/google/hal_radioext_default.te
index eef71cf..0f561ac 100644
--- a/whitechapel/vendor/google/hal_radioext_default.te
+++ b/whitechapel/vendor/google/hal_radioext_default.te
@@ -4,6 +4,7 @@
hwbinder_use(hal_radioext_default)
get_prop(hal_radioext_default, hwservicemanager_prop)
+set_prop(hal_radioext_default, vendor_gril_prop)
add_hwservice(hal_radioext_default, hal_radioext_hwservice)
binder_call(hal_radioext_default, grilservice_app)
diff --git a/whitechapel/vendor/google/modem_svc_sit.te b/whitechapel/vendor/google/modem_svc_sit.te
index 0eb7498..8e4ac3d 100644
--- a/whitechapel/vendor/google/modem_svc_sit.te
+++ b/whitechapel/vendor/google/modem_svc_sit.te
@@ -41,4 +41,10 @@
# Allow modem_svc_sit to access modem image file/dir
allow modem_svc_sit modem_img_file:dir r_dir_perms;
allow modem_svc_sit modem_img_file:file r_file_perms;
-allow modem_svc_sit modem_img_file:lnk_file r_file_perms;
\ No newline at end of file
+allow modem_svc_sit modem_img_file:lnk_file r_file_perms;
+
+# Allow modem_svc_sit to access socket for UMI
+userdebug_or_eng(`
+ allow modem_svc_sit radio_vendor_data_file:sock_file { create unlink };
+')
+
diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te
index 98da3e3..21bd888 100644
--- a/whitechapel/vendor/google/property.te
+++ b/whitechapel/vendor/google/property.te
@@ -2,6 +2,7 @@
vendor_internal_prop(vendor_prop)
vendor_internal_prop(vendor_rcs_prop)
vendor_internal_prop(vendor_rild_prop)
+vendor_internal_prop(vendor_gril_prop)
vendor_internal_prop(sensors_prop)
vendor_internal_prop(vendor_ssrdump_prop)
vendor_internal_prop(vendor_usb_config_prop)
diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts
index c9187a3..ba41d6a 100644
--- a/whitechapel/vendor/google/property_contexts
+++ b/whitechapel/vendor/google/property_contexts
@@ -8,6 +8,9 @@
vendor.radio. u:object_r:vendor_rild_prop:s0
ro.vendor.build.svn u:object_r:vendor_rild_prop:s0
+# for GRIL
+vendor.gril. u:object_r:vendor_gril_prop:s0
+
# Ramdump
persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0