Snap for 9254301 from 9ba6d977f1 to udc-release

Change-Id: I04747c8dd8148048d663ef622221f971d752bdd1
This commit is contained in:
Android Build Coastguard Worker 2022-11-04 02:06:38 +00:00
commit 126f2f917d
4 changed files with 2 additions and 10 deletions

View file

@ -226,6 +226,7 @@ on init
chown system system /dev/logbuffer_wireless
chown system system /dev/logbuffer_pca9468
chown system system /dev/logbuffer_cpm
chown system system /dev/logbuffer_bd
# Dump maxfg
chown system system /sys/class/power_supply/maxfg/m5_model_state

View file

@ -82,8 +82,6 @@
<permission name="android.permission.READ_CALL_LOG" fixed="false"/>
<permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
<!-- Used to set up a Wi-Fi P2P network -->
<!-- TODO(b/231966826): Remove the location permission after Restore targets to T. -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.NEARBY_WIFI_DEVICES" fixed="false"/>
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>

View file

@ -248,7 +248,6 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
Dumpstate::Dumpstate()
: mTextSections{
{ "pre-touch", [this](int fd) { dumpPreTouchSection(fd); } },
{ "wlan", [this](int fd) { dumpWlanSection(fd); } },
{ "memory", [this](int fd) { dumpMemorySection(fd); } },
{ "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
{ "cpu", [this](int fd) { dumpCpuSection(fd); } },
@ -320,12 +319,6 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
"not avalable from the command line.\n", fd);
}
// Dump items related to wlan
void Dumpstate::dumpWlanSection(int fd) {
RunCommandToFd(fd, "WLAN Debug Dump", {"/vendor/bin/sh", "-c",
"cat /sys/wifi/dump_start"});
}
// Dump items related to power and battery
void Dumpstate::dumpPowerSection(int fd) {
struct stat buffer;
@ -402,6 +395,7 @@ void Dumpstate::dumpPowerSection(int fd) {
DumpFileToFd(fd, "TTF stats", "/sys/class/power_supply/battery/ttf_stats");
DumpFileToFd(fd, "maxq", "/dev/logbuffer_maxq");
DumpFileToFd(fd, "aacr_state", "/sys/class/power_supply/battery/aacr_state");
DumpFileToFd(fd, "TEMP/DOCK-DEFEND", "/dev/logbuffer_bd");
RunCommandToFd(fd, "TRICKLE-DEFEND Config", {"/vendor/bin/sh", "-c",
" cd /sys/devices/platform/google,battery/power_supply/battery/;"

View file

@ -47,7 +47,6 @@ class Dumpstate : public BnDumpstateDevice {
// Text sections that can be dumped individually on the command line in
// addition to being included in full dumps
void dumpWlanSection(int fd);
void dumpPowerSection(int fd);
void dumpThermalSection(int fd);
void dumpPreTouchSection(int fd);