Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master

This commit is contained in:
TreeHugger Robot
2020-01-16 18:29:32 +00:00
committed by Android (Google) Code Review
3 changed files with 18 additions and 4 deletions

View File

@@ -139,5 +139,10 @@
<permission name="android.permission.RECEIVE_MMS" fixed="false"/>
<permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
</exception>
<exception package="com.google.android.apps.scone">
<!-- Used to call ActivityTransition API for Smart PNO -->
<permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
</exception>
</exceptions>

View File

@@ -48,7 +48,7 @@ PRODUCT_COPY_FILES += \
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.build.svn=38
ro.vendor.build.svn=40
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \

View File

@@ -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<void> 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");