merge in lmp-mr1-release history after reset to c39da5640fdb2799b70d9ddcd3236aaf7b802cb9
diff --git a/dumpstate/dumpstate.c b/dumpstate/dumpstate.c
index 0efa482..a9f0676 100644
--- a/dumpstate/dumpstate.c
+++ b/dumpstate/dumpstate.c
@@ -29,5 +29,7 @@
dump_file("SMB135x Status Regs", "/d/smb135x/status_registers");
dump_file("Battery Statistics", "/sys/class/power_supply/battery/uevent");
dump_file("PCIe IPC Logging", "/d/ipc_logging/pcie0/log");
+ dump_file("HSIC IPC Control Logging", "/d/xhci_msm_hsic_dbg/show_ctrl_events");
+ dump_file("HSIC IPC Data Logging", "/d/xhci_msm_hsic_dbg/show_data_events");
run_command("Subsystem Tombstone list", 5, SU_PATH, "root", "ls", "-l", "/data/tombstones/ramdump", NULL);
};
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 2a53440..d7ff8d1 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -41,3 +41,7 @@
# Permission to run netd commands
allow netmgrd netd_socket:sock_file write;
+
+#Allow access to files associated with netd
+allow netmgrd net_data_file:dir r_dir_perms;
+
