Snap for 4726689 from 18e89069e3cccc23a8fd08f4d85488a79fb78748 to oreo-mr1-cts-releaseandroid-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10oreo-mr1-cts-release

Change-Id: I70323c5344d4b2b2a9548ed700b69ebcfd85fa77

6 files changed, 8 insertions, 6 deletions

diff --git a/device.mk b/device.mk
index 9b93bd6e..89319f4c 100755
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=7
+    ro.vendor.build.svn=8
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index efcf8bcf..f50919cd 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -216,6 +216,8 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
       RunCommandToFd(fd, "FP LOGS", {"qsee_logger", "-d"});
     }
 
+    DumpFileToFd(fd, "Battery type", "/sys/class/power_supply/bms/battery_type");
+
     RunCommandToFd(fd, "Battery cycle count", {"/vendor/bin/sh", "-c", "for f in 1 2 3 4 5 6 7 8 ; do echo $f > /sys/class/power_supply/bms/cycle_count_id; count=`cat /sys/class/power_supply/bms/cycle_count`; echo \"$f: $count\"; done"});
     return Void();
 };
diff --git a/sepolicy/vendor/dumpstate.te b/sepolicy/vendor/dumpstate.te
index ce328ce8..e9932005 100644
--- a/sepolicy/vendor/dumpstate.te
+++ b/sepolicy/vendor/dumpstate.te
@@ -11,3 +11,6 @@ userdebug_or_eng(`
 
   binder_call(dumpstate, per_mgr)
 ')
+
+allow hal_dumpstate sysfs_batteryinfo:dir search;
+allow hal_dumpstate sysfs_batteryinfo:file rw_file_perms;
diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts
index 6acbe849..58e4014a 100644
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -53,7 +53,6 @@ genfscon sysfs /devices/soc0                                            u:object
 genfscon sysfs /devices/soc/caa0000.qcom,jpeg                           u:object_r:sysfs_camera:s0
 genfscon sysfs /devices/soc/caa4000.qcom,fd                             u:object_r:sysfs_camera:s0
 genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qpnp,fg/power_supply/bms                        u:object_r:sysfs_batteryinfo:s0
-genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qpnp,fg/power_supply/bms/capacity               u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/battery/capacity    u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /bus/msm_subsys                                          u:object_r:sysfs_msm_subsys:s0
 genfscon sysfs /module/subsystem_restart                                u:object_r:sysfs_msm_subsys_restart:s0
diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te
index aa92c358..b588634b 100644
--- a/sepolicy/vendor/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
@@ -4,10 +4,7 @@ allow hal_power_default perfd_socket:sock_file write;
 allow hal_power_default sysfs_graphics:dir search;
 allow hal_power_default sysfs_graphics:file r_file_perms;
 
-userdebug_or_eng(`
-# debugfs entries are only needed in user-debug or eng builds
 allow hal_power_default debugfs_rpm:file r_file_perms;
 
 allow hal_power_default debugfs_wlan:dir r_dir_perms;
 allow hal_power_default debugfs_wlan:file r_file_perms;
-')
diff --git a/sepolicy/vendor/kernel.te b/sepolicy/vendor/kernel.te
index 23686463..d2bf9c0f 100644
--- a/sepolicy/vendor/kernel.te
+++ b/sepolicy/vendor/kernel.te
@@ -1,7 +1,6 @@
 # for diag over socket
 userdebug_or_eng(`
   allow kernel self:socket create;
-  allow kernel debugfs_wlan:dir search;
 ')
 
 allow kernel vendor_firmware_file:dir search;
@@ -12,3 +11,5 @@ dontaudit kernel kernel:system module_request;
 
 allow kernel debugfs_ipc:dir search;
 allow kernel persist_file:dir search;
+
+allow kernel debugfs_wlan:dir search;