From 5aa70dcae9fc7d389dbc000633b2fa9c1bf5bacc Mon Sep 17 00:00:00 2001 From: Holmes Chou Date: Tue, 16 May 2023 05:43:19 +0000 Subject: [PATCH 1/3] Lyric: Remove unused flag Remove unused flag Bug: 272148112 Test: local build Change-Id: I2fa89e163cd9beeb51ed959fb7a4c1d2a91eb496 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 4b9e6005..8655710b 100644 --- a/device.mk +++ b/device.mk @@ -562,7 +562,6 @@ endif # Lyric Camera HAL settings include device/google/gs-common/camera/lyric.mk $(call soong_config_set,lyric,soc,zuma) -$(call soong_config_set,lyric,kernel_version,v515) $(call soong_config_set,google3a_config,soc,zuma) # WiFi From 6479af753390a120a7156360c155641025a5fdc3 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Wed, 17 May 2023 09:11:12 +0000 Subject: [PATCH 2/3] Revert "Revert "audio: set CCA to be enable by default"" This reverts commit d8f891cf943fcf391e790bda3dbf7f5d19b858b3. Reason for revert: Change-Id: I48498ca6f286d805aa0a9c69e9af65897d060579 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index d36b2fd6..5586f8d1 100644 --- a/device.mk +++ b/device.mk @@ -995,7 +995,7 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) ## Audio properties ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=false \ + persist.vendor.audio.cca.enabled=true \ persist.vendor.audio.cca.unsupported=false PRODUCT_PROPERTY_OVERRIDES += \ From 2a3464431ca3d980af8e9bf03a4933f958ff53d9 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Wed, 17 May 2023 21:00:52 +0800 Subject: [PATCH 3/3] health: add suspend support for charger mode Override ChargerEnableSuspend() function to true to support suspend and resume in charger mode. Bug: 282142607 Test: Confirm the device enter suspend in charger mode Change-Id: I16f03da67a8830bf4130d67948601e0534d8aa27 Signed-off-by: Jack Wu --- health/Health.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/health/Health.cpp b/health/Health.cpp index 92f721c2..f25e2f86 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -231,6 +231,16 @@ ndk::ScopedAStatus HealthImpl::getDiskStats(std::vector* out) } // namespace aidl::android::hardware::health::implementation +#ifndef __ANDROID_RECOVERY__ +namespace aidl::android::hardware::health { +class ChargerCallbackImpl : public ChargerCallback { + public: + ChargerCallbackImpl(const std::shared_ptr& service) : ChargerCallback(service) {} + bool ChargerEnableSuspend() override { return true; } +}; +} //namespace aidl::android::hardware::health +#endif // !__ANDROID_RECOVERY__ + int main(int argc, char **argv) { using ::aidl::android::hardware::health::implementation::HealthImpl; @@ -251,7 +261,8 @@ int main(int argc, char **argv) { // In regular mode, start charger UI. #ifndef __ANDROID_RECOVERY__ LOG(INFO) << "Starting charger mode with UI."; - return ChargerModeMain(binder, std::make_shared(binder)); + auto charger_callback = std::make_shared(binder); + return ChargerModeMain(binder, charger_callback); #endif // In recovery, ignore --charger arg. LOG(INFO) << "Starting charger mode without UI.";