commit 2ece80947b49534569e2e67795f78a7d8502b85c
author Adam Shih <adamshih@google.com> Fri Mar 06 00:38:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 06 00:38:48 2020 +0000
tree a195d1bcacab061137df342e5f21774d5b73a573
parent 00854c24e96ac4049e286282c788edc9af650a98
parent 7afe7269cd4a32a0c15f81df72325522a11ba920

Merge "Add Alex to OWNERS"

default-permissions.xml

diff --git a/default-permissions.xml b/default-permissions.xml
index 695da91..b64420e 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -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>

device.mk

diff --git a/device.mk b/device.mk
index 1af567b..84c0d14 100755
--- a/device.mk
+++ b/device.mk
@@ -48,7 +48,7 @@
 
 # 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 += \

dumpstate/DumpstateDevice.cpp

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 4c1c21e..4b7e030 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -212,6 +212,15 @@
     }
 }
 
+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 @@
     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");