From 2a3a17fd6af956e3276a8cfdd4209d8a92fbecc8 Mon Sep 17 00:00:00 2001 From: Lubo Hristov Date: Fri, 11 Oct 2019 15:37:09 -0700 Subject: [PATCH 1/6] Bump wahoo SVN to 37 bug:141626492 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 8b7b10cb..1528ef45 100755 --- a/device.mk +++ b/device.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=37 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From cc2dce4a2409aebc315b532f33dada049ba5481b Mon Sep 17 00:00:00 2001 From: Kelly Rossmoyer Date: Fri, 25 Oct 2019 00:29:21 -0700 Subject: [PATCH 2/6] dumpstate: add key timestamps to power dump This change adds two key timestamps to the power stats section of dumpstate_board.txt: the time at which the device was booted and the current time immediately prior to capturing the power stats. It also refactors the lines of code for dumping power stats into a self-contained function to improve code maintainability. Currently, because the process of generating a bugreport takes several minutes, there is significant uncertainty about the temporal relationship between the bugreport timestamp and the time at which the power stats were captured. Also, boot time is reverse-engineered - again, with an unhelpful degree of uncertainty - by combining the bugreport timestamp with uptime. Generating these two timestamps immediately prior to capturing live power stats will allow identification of the onset times of key subsystem-related power issues with much more precision than is currently possible. Bug: 143312304 Test: Built userdebug and user builds, installed and tested by generating a bugreport and verifying the new content was present. Change-Id: Ie92a6e1f8e6088939819738bcff8cd9a0106f5a8 --- dumpstate/DumpstateDevice.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 4c1c21ec..4b7e030f 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -212,6 +212,15 @@ void DumpstateDevice::dumpModem(int fd, int fdModem) } } +static void DumpPower(int fd) { + RunCommandToFd(fd, "Power Stats Times", {"/vendor/bin/sh", "-c", + "echo -n \"Boot: \" && /vendor/bin/uptime -s &&" + "echo -n \"Now: \" && date"}); + DumpFileToFd(fd, "RPM Stats", "/d/rpm_stats"); + DumpFileToFd(fd, "Power Management Stats", "/d/rpm_master_stats"); + DumpFileToFd(fd, "WLAN Power Stats", "/d/wlan0/power_stats"); +} + static void DumpTouch(int fd) { if (!access("/sys/android_touch", R_OK)) { DumpFileToFd(fd, "Synaptics touch firmware version", @@ -261,9 +270,9 @@ Return DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { DumpFileToFd(fd, "UFS size", "/sys/block/sda/size"); RunCommandToFd(fd, "UFS health", {"/vendor/bin/sh", "-c", "for f in $(find /sys/kernel/debug/ufshcd0 -type f); do if [[ -r $f && -f $f ]]; then echo --- $f; cat $f; fi; done"}); DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts"); - DumpFileToFd(fd, "RPM Stats", "/d/rpm_stats"); - DumpFileToFd(fd, "Power Management Stats", "/d/rpm_master_stats"); - DumpFileToFd(fd, "WLAN Power Stats", "/d/wlan0/power_stats"); + + DumpPower(fd); + DumpFileToFd(fd, "LL-Stats", "/d/wlan0/ll_stats"); DumpFileToFd(fd, "ICNSS Stats", "/d/icnss/stats"); DumpFileToFd(fd, "SMD Log", "/d/ipc_logging/smd/log"); From 2aec5d4f606d6c9701f094f586d08252901848ea Mon Sep 17 00:00:00 2001 From: Lubo Hristov Date: Wed, 13 Nov 2019 21:33:47 -0800 Subject: [PATCH 3/6] Set wahoo SVN to 38 bug:144373594 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 1528ef45..3f64ad47 100755 --- a/device.mk +++ b/device.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 9ffd3bd3bc4810a7c49285ae2890f1d0007fcaef Mon Sep 17 00:00:00 2001 From: Evan Tyra Date: Mon, 18 Nov 2019 11:58:16 -0500 Subject: [PATCH 4/6] Add CHS Permissions to Pixel 2 Activity Recognition is needed specifically for the Smart PNO Scanning feature that is being ported to Pixel 2, Smart OOS Scanning is not being ported so I removed it from the comment. Bug: 143223240 Test: Local Change-Id: Iedc9177ac49fb188183bca992e7d0a106df1cf57 --- default-permissions.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 695da91d..b64420ef 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -139,5 +139,10 @@ + + + + + From 40288a98d3f706470fe0501127143c363618134a Mon Sep 17 00:00:00 2001 From: Lubo Hristov Date: Mon, 16 Dec 2019 20:39:14 -0800 Subject: [PATCH 5/6] Set wahoo SVN to 39 bug:146378789 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3f64ad47..f8cc0954 100755 --- a/device.mk +++ b/device.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 0f08990ecccc1fc1b2f46aecd3b99a5a333d2c7e Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 10 Jan 2020 12:58:04 -0800 Subject: [PATCH 6/6] Update Wahoo SVN to 40 Bug:147450082 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f8cc0954..dca0a558 100755 --- a/device.mk +++ b/device.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \