Merge changes I9868bdfd,I1085decf into udc-d1-dev am: 6b9e3f74b6

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/21947244

Change-Id: I96b2f88eabdc5ad1666ece7e8ae1e802579e95a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wilson Sung 2023-03-13 05:00:45 +00:00 committed by Automerger Merge Worker
commit 4bdc1c25c6
2 changed files with 2 additions and 3 deletions

View file

@ -19,7 +19,6 @@ hal_secure_element_uicc hidl_base_hwservice hwservice_manager b/264483151
hal_thermal_default sysfs file b/272166722 hal_thermal_default sysfs file b/272166722
hal_thermal_default sysfs file b/272166987 hal_thermal_default sysfs file b/272166987
hal_usb_gadget_impl sysfs_batteryinfo dir b/272166827 hal_usb_gadget_impl sysfs_batteryinfo dir b/272166827
insmod-sh insmod-sh lockdown b/272166723
kernel vendor_fw_file dir b/272166737 kernel vendor_fw_file dir b/272166737
kernel vendor_fw_file dir b/272166787 kernel vendor_fw_file dir b/272166787
mtectrl unlabeled dir b/264483752 mtectrl unlabeled dir b/264483752

View file

@ -1,6 +1,6 @@
# b/260522378 # b/260522378
dontaudit insmod-sh vendor_regmap_debugfs:dir { search }; dontaudit insmod-sh vendor_regmap_debugfs:dir { search };
# b/264490091 # b/272166723
userdebug_or_eng(` userdebug_or_eng(`
permissive insmod-sh; allow insmod-sh self:lockdown integrity;
') ')