Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I429fc56ad989b6baa87448dd2c148a84d31551b9
Change-Id: I5d832993fcd8f5e2b678d0802ca0f33747ae5e07
diff --git a/vendor/google/modem_diagnostics.te b/vendor/google/modem_diagnostics.te
index 5161102..97f8586 100644
--- a/vendor/google/modem_diagnostics.te
+++ b/vendor/google/modem_diagnostics.te
@@ -20,4 +20,7 @@
set_prop(modem_diagnostic_app, vendor_modem_diag_prop)
set_prop(modem_diagnostic_app, radio_control_prop)
+
+ allow modem_diagnostic_app sysfs_batteryinfo:file r_file_perms;
+ allow modem_diagnostic_app sysfs_batteryinfo:dir search;
')
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 0dcd4fc..2b65291 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -1,15 +1,15 @@
-type ab_block_device, dev_type, bdev_type;
+type ab_block_device, dev_type;
type at_device, dev_type;
type avtimer_device, dev_type;
type bt_device, dev_type;
-type devinfo_block_device, dev_type, bdev_type;
+type devinfo_block_device, dev_type;
type diag_device, dev_type, mlstrustedobject;
type dsp_device, dev_type;
type easel_device, dev_type, mlstrustedobject;
-type gpt_block_device, dev_type, bdev_type;
+type gpt_block_device, dev_type;
type ipa_dev, dev_type;
-type modem_block_device, dev_type, bdev_type;
-type persist_block_device, dev_type, bdev_type;
+type modem_block_device, dev_type;
+type persist_block_device, dev_type;
type qsee_ipc_irq_spss_device, dev_type;
type qdsp_device, dev_type, mlstrustedobject;
type ramdump_device, dev_type;
@@ -18,7 +18,7 @@
type sg_device, dev_type;
type smd_device, dev_type;
type spcom_device, dev_type;
-type ssd_block_device, dev_type, bdev_type;
+type ssd_block_device, dev_type;
type ssr_device, dev_type;
type wlan_device, dev_type;
-type xbl_block_device, dev_type, bdev_type;
+type xbl_block_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 13d6008..14f4da8 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -13,7 +13,7 @@
type sysfs_poweroff, sysfs_type, fs_type;
type sysfs_rmtfs, sysfs_type, fs_type;
type sysfs_soc, sysfs_type, fs_type;
-type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type;
type sysfs_scsi_devices_other, sysfs_type, fs_type;
type sysfs_system_sleep_stats, sysfs_type, fs_type;
type sysfs_timestamp_switch, sysfs_type, fs_type;
