diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-20 07:45:34 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-20 07:45:34 +0000 |
commit | 6a9fd0c74c1d8b6d5bab0d9ebc332ed16b464323 (patch) | |
tree | a0d543d3abb4453c822d6cebd3c01e14278cec03 | |
parent | 59601c64f0b41de8f27c2f7dc6ddb8c2fd6ef7ca (diff) | |
parent | cd6f8d52a4a5591ae5223ca9fcaf30c2d5c0fb8a (diff) | |
download | wahoo-6a9fd0c74c1d8b6d5bab0d9ebc332ed16b464323.tar.gz |
release-request-42a2a3ad-8c90-4c84-a0ad-5d067beb8e30-for-git_oc-mr1-release-4349323 snap-temp-L16100000104414353
Change-Id: I67a40fa64564f4bb084a4a2c92abd38a7ff49398
-rwxr-xr-x | dumpstate/DumpstateDevice.cpp | 3 | ||||
-rw-r--r-- | init.hardware.rc | 3 | ||||
-rw-r--r-- | sepolicy/vendor/hal_dumpstate_impl.te | 4 | ||||
-rw-r--r-- | sepolicy/vendor/wcnss_filter.te | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 2e908638..310f45ad 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -182,6 +182,9 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { DumpFileToFd(fd, "SoC serial number", "/sys/devices/soc0/serial_number"); DumpFileToFd(fd, "CPU present", "/sys/devices/system/cpu/present"); DumpFileToFd(fd, "CPU online", "/sys/devices/system/cpu/online"); + DumpFileToFd(fd, "UFS model", "/sys/block/sda/device/model"); + DumpFileToFd(fd, "UFS rev", "/sys/block/sda/device/rev"); + DumpFileToFd(fd, "UFS size", "/sys/block/sda/size"); DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts"); DumpFileToFd(fd, "RPM Stats", "/d/rpm_stats"); DumpFileToFd(fd, "Power Management Stats", "/d/rpm_master_stats"); diff --git a/init.hardware.rc b/init.hardware.rc index 4ffe8b0a..6a28e0f2 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -609,9 +609,8 @@ service ss_ramdump /vendor/bin/subsystem_ramdump on property:persist.sys.ssr.enable_ramdumps=1 write /sys/module/subsystem_restart/parameters/enable_ramdumps 1 - mkdir /data/vendor/ssrdump 761 root system + mkdir /data/vendor/ssrdump 771 root system mkdir /data/vendor/ramdump 771 root system - mkdir /data/vendor/ramdump/bluetooth 771 root system start ss_ramdump on property:persist.sys.ssr.enable_ramdumps=0 diff --git a/sepolicy/vendor/hal_dumpstate_impl.te b/sepolicy/vendor/hal_dumpstate_impl.te index c0a14f9d..9512b223 100644 --- a/sepolicy/vendor/hal_dumpstate_impl.te +++ b/sepolicy/vendor/hal_dumpstate_impl.te @@ -59,3 +59,7 @@ allow hal_dumpstate_impl display_vendor_data_file:file r_file_perms; # Access to touch firmware info allow hal_dumpstate_impl sysfs_touch:dir r_dir_perms; allow hal_dumpstate_impl sysfs_touch:file rw_file_perms; + +# Access to UFS info +allow hal_dumpstate_impl sysfs_scsi_devices_0000:dir r_dir_perms; +allow hal_dumpstate_impl sysfs_scsi_devices_0000:file r_file_perms; diff --git a/sepolicy/vendor/wcnss_filter.te b/sepolicy/vendor/wcnss_filter.te index c7c72c77..d7c72448 100644 --- a/sepolicy/vendor/wcnss_filter.te +++ b/sepolicy/vendor/wcnss_filter.te @@ -10,9 +10,10 @@ allow wcnss_filter hci_attach_dev:chr_file rw_file_perms; userdebug_or_eng(` allow wcnss_filter diag_device:chr_file rw_file_perms; - allow wcnss_filter ramdump_vendor_data_file:dir create_dir_perms; - allow wcnss_filter ramdump_vendor_data_file:file create_file_perms; + allow wcnss_filter ramdump_vendor_data_file:dir w_dir_perms; + allow wcnss_filter ramdump_vendor_data_file:file { create w_file_perms }; r_dir_file(wcnss_filter, debugfs_ipc) + set_prop(wcnss_filter, ssr_prop) ') #allow wakelock |