From 48d6508920de8976b680bef7129c08b37ff414b5 Mon Sep 17 00:00:00 2001 From: Cody Heiner Date: Wed, 1 Mar 2023 15:53:07 -0800 Subject: [PATCH 1/4] Update com.google.input version in manifest Test: Previously failing AOSP presubmit tests pass. Bug: 271227149 Change-Id: Ia41b43626ee32a5552ccef9371cabc699277d342 --- device_framework_matrix_product.xml | 1 + manifest.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index e906ab0d..70b22741 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -118,6 +118,7 @@ com.google.input + 2 ITouchContextService default diff --git a/manifest.xml b/manifest.xml index 402cbba9..7814e22e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -25,6 +25,7 @@ com.google.input + 2 ITouchContextService default From e7b8ae32a3f1b4f00f5fbb059d0acb716f9ca541 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 28 Mar 2023 12:55:08 +0800 Subject: [PATCH 2/4] create a dump for gs201 Bug: 273380509 Test: adb bugreport Change-Id: I44564eca36026608d7fe599ca8b8e412caa50c92 --- dumpstate/Android.bp | 15 +++++++++++++++ dumpstate/Dumpstate.cpp | 5 ----- dumpstate/Dumpstate.h | 1 - dumpstate/dump_gs201.cpp | 22 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 dumpstate/dump_gs201.cpp diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp index 98c827a6..6efb5be6 100644 --- a/dumpstate/Android.bp +++ b/dumpstate/Android.bp @@ -2,6 +2,21 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +cc_binary { + name: "dump_gs201", + srcs: ["dump_gs201.cpp"], + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + ], + shared_libs: [ + "libdump", + ], + vendor: true, + relative_install_path: "dump", +} + cc_binary { name: "android.hardware.dumpstate-service.gs201", srcs: [ diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index e3928ea9..34c41791 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -72,7 +72,6 @@ Dumpstate::Dumpstate() : mTextSections{ { "wlan", [this](int fd) { dumpWlanSection(fd); } }, { "power", [this](int fd) { dumpPowerSection(fd); } }, - { "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } }, } {} // Dump data requested by an argument to the "dump" interface, or help info @@ -383,10 +382,6 @@ void Dumpstate::dumpLogSection(int fd, int fd_bin) RunCommandToFd(fd, "RM LOG", { "/vendor/bin/rm", logCombined.c_str()}, CommandOptions::WithTimeout(2).Build()); } -void Dumpstate::dumpPixelTraceSection(int fd) { - DumpFileToFd(fd, "Pixel trace", "/sys/kernel/tracing/instances/pixel/trace"); -} - ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds, IDumpstateDevice::DumpstateMode in_mode, int64_t in_timeoutMillis) { diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index a6d6bcf6..6c4b7308 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -50,7 +50,6 @@ class Dumpstate : public BnDumpstateDevice { // addition to being included in full dumps void dumpWlanSection(int fd); void dumpPowerSection(int fd); - void dumpPixelTraceSection(int fd); void dumpLogSection(int fd, int fdModem); diff --git a/dumpstate/dump_gs201.cpp b/dumpstate/dump_gs201.cpp new file mode 100644 index 00000000..062f4ded --- /dev/null +++ b/dumpstate/dump_gs201.cpp @@ -0,0 +1,22 @@ +/* + * Copyright 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include + +// Dump gs201 info +int main() { + dumpFileContent("Pixel trace", "/sys/kernel/tracing/instances/pixel/trace"); + return 0; +} From 3cbb3ee5d93668ef0f6e973947333649d4c9c1f2 Mon Sep 17 00:00:00 2001 From: Usama Date: Wed, 29 Mar 2023 03:32:28 +0000 Subject: [PATCH 3/4] Revert "Update com.google.input version in manifest" Revert submission 21686241-21686241 Reason for revert: Culprit CLs for b/275635399 Reverted changes: /q/submissionid:21686241-21686241 Change-Id: I4c19398985c54d5c33984fb469cf90887cefacb0 --- device_framework_matrix_product.xml | 1 - manifest.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 70b22741..e906ab0d 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -118,7 +118,6 @@ com.google.input - 2 ITouchContextService default diff --git a/manifest.xml b/manifest.xml index 7814e22e..402cbba9 100644 --- a/manifest.xml +++ b/manifest.xml @@ -25,7 +25,6 @@ com.google.input - 2 ITouchContextService default From 804ed04262d0d5d57daa3464c979b5112d76a6c3 Mon Sep 17 00:00:00 2001 From: chengfeitao Date: Sat, 11 Mar 2023 00:13:29 +0000 Subject: [PATCH 4/4] Force slowJpegMode on certain camera1 apps Turn off the large JPEG stream on camera1 apps that experience high power consumption during video call Bug: 254350466 Test: Manual testing with Messenger app video call Change-Id: Ib5012a39caffc1a135b9e2a7a2ef9ed2df064b2e --- overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1f1bceac..b6a8951e 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -289,4 +289,10 @@ "com.shannon.imsservice" "com.android.phone" + + + + com.facebook.orca + com.skype.raider +