Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 10161738 from 0b128ac62f to udc-qpr1-release

Browse source 
Change-Id: I504318759e26e476a1ced604a5101069a790a5c6
This commit is contained in:
Android Build Coastguard Worker 2023-05-19 01:08:39 +00:00
commit 1da7bdd8a9
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device.mk
View file

@ -563,7 +563,6 @@ endif
# Lyric Camera HAL settings # Lyric Camera HAL settings
include device/google/gs-common/camera/lyric.mk include device/google/gs-common/camera/lyric.mk
$(call soong_config_set,lyric,soc,zuma) $(call soong_config_set,lyric,soc,zuma)
$(call soong_config_set,lyric,kernel_version,v515)
$(call soong_config_set,google3a_config,soc,zuma) $(call soong_config_set,google3a_config,soc,zuma)
# WiFi # WiFi
@ -1005,7 +1004,7 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT))
## Audio properties ## Audio properties
##Audio Vendor property ##Audio Vendor property
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false \ persist.vendor.audio.cca.enabled=true \
persist.vendor.audio.cca.unsupported=false persist.vendor.audio.cca.unsupported=false
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

13
health/Health.cpp
View file

@ -231,6 +231,16 @@ ndk::ScopedAStatus HealthImpl::getDiskStats(std::vector<DiskStats>* out)
} // namespace aidl::android::hardware::health::implementation } // namespace aidl::android::hardware::health::implementation
#ifndef __ANDROID_RECOVERY__
namespace aidl::android::hardware::health {
class ChargerCallbackImpl : public ChargerCallback {
public:
ChargerCallbackImpl(const std::shared_ptr<Health>& service) : ChargerCallback(service) {}
bool ChargerEnableSuspend() override { return true; }
};
} //namespace aidl::android::hardware::health
#endif // !__ANDROID_RECOVERY__
int main(int argc, char **argv) { int main(int argc, char **argv) {
using ::aidl::android::hardware::health::implementation::HealthImpl; using ::aidl::android::hardware::health::implementation::HealthImpl;
@ -251,7 +261,8 @@ int main(int argc, char **argv) {
// In regular mode, start charger UI. // In regular mode, start charger UI.
#ifndef __ANDROID_RECOVERY__ #ifndef __ANDROID_RECOVERY__
LOG(INFO) << "Starting charger mode with UI."; LOG(INFO) << "Starting charger mode with UI.";
return ChargerModeMain(binder, std::make_shared<ChargerCallback>(binder)); auto charger_callback = std::make_shared<aidl::android::hardware::health::ChargerCallbackImpl>(binder);
return ChargerModeMain(binder, charger_callback);
#endif #endif
// In recovery, ignore --charger arg. // In recovery, ignore --charger arg.
LOG(INFO) << "Starting charger mode without UI."; LOG(INFO) << "Starting charger mode without UI.";