Merge "Revert "Revert "Add /sys/kernel/memory_state_time to sysfs_power."""
diff --git a/device-common.mk b/device-common.mk
index 1a579ed..103e792 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -512,7 +512,7 @@
PRODUCT_COPY_FILES += \
device/google/marlin/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \
- device/google/marlin/nfc/libpn551_fw.so:$(TARGET_COPY_OUT_VENDOR)/firmware/libpn551_fw.so
+ device/google/marlin/nfc/libpn551_fw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpn551_fw.so
# Bootloader HAL used for A/B updates.
PRODUCT_PACKAGES += \
diff --git a/sepolicy/bug_map b/sepolicy/bug_map
index bfc9cac..8650395 100644
--- a/sepolicy/bug_map
+++ b/sepolicy/bug_map
@@ -1,3 +1,8 @@
+cameraserver mediacodec binder 77924653
+cnd vendor_shell_exec file 77922167
+hal_audio_default priv_app fd 77926553
+netd sysfs_pcie dir 77870037
netutils_wrapper proc_net file 72099135
netutils_wrapper sysfs_net file 72157903
+perfd perfd capability 77924406
vendor_init unlabeled dir 77635294
diff --git a/sepolicy/hrdump.te b/sepolicy/hrdump.te
index 2cd5489..c558b5b 100644
--- a/sepolicy/hrdump.te
+++ b/sepolicy/hrdump.te
@@ -16,4 +16,7 @@
allow htc_ramdump ramdump_vendor_data_file:dir { create_dir_perms };
allow htc_ramdump block_device:dir { search };
allow htc_ramdump ramdump_block_device:blk_file { open read };
+
+allow htc_ramdump proc_cmdline:file r_file_perms;
+r_dir_file(htc_ramdump, sysfs_dt_firmware_android)
')
diff --git a/sepolicy/location.te b/sepolicy/location.te
index c51e756..2375691 100644
--- a/sepolicy/location.te
+++ b/sepolicy/location.te
@@ -66,3 +66,5 @@
allow location port:tcp_socket name_connect;
allow location self:tcp_socket { connect create read setopt write };
allow location self:udp_socket { create ioctl read write };
+
+get_prop(location, wifi_prop)
