From 0c217577e32b5dc6b42bfce4bdbd890e496460fa Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 24 Feb 2020 17:39:51 -0800 Subject: [PATCH] Remove String8(StaticLinkage) references. These are a legacy holdover from when libutils String8 couldn't be used at static time. Bug: 150325737 # fixing GSI breakage Test: N/A Change-Id: I009b2ca53631509072b4085f3f53c0b94e71b13e (cherry picked from commit 15f04b8af90ade954c45aab571fa4b625a43b872) Merged-In: I009b2ca53631509072b4085f3f53c0b94e71b13e --- health/2.0/default/HealthImplDefault.cpp | 12 ------------ health/utils/libhealthloop/utils.cpp | 15 --------------- 2 files changed, 27 deletions(-) diff --git a/health/2.0/default/HealthImplDefault.cpp b/health/2.0/default/HealthImplDefault.cpp index e3cbefdbeb..08fee9ea71 100644 --- a/health/2.0/default/HealthImplDefault.cpp +++ b/health/2.0/default/HealthImplDefault.cpp @@ -21,18 +21,6 @@ using android::hardware::health::V2_0::IHealth; using android::hardware::health::V2_0::implementation::Health; static struct healthd_config gHealthdConfig = { - .batteryStatusPath = android::String8(android::String8::kEmptyString), - .batteryHealthPath = android::String8(android::String8::kEmptyString), - .batteryPresentPath = android::String8(android::String8::kEmptyString), - .batteryCapacityPath = android::String8(android::String8::kEmptyString), - .batteryVoltagePath = android::String8(android::String8::kEmptyString), - .batteryTemperaturePath = android::String8(android::String8::kEmptyString), - .batteryTechnologyPath = android::String8(android::String8::kEmptyString), - .batteryCurrentNowPath = android::String8(android::String8::kEmptyString), - .batteryCurrentAvgPath = android::String8(android::String8::kEmptyString), - .batteryChargeCounterPath = android::String8(android::String8::kEmptyString), - .batteryFullChargePath = android::String8(android::String8::kEmptyString), - .batteryCycleCountPath = android::String8(android::String8::kEmptyString), .energyCounter = nullptr, .boot_min_cap = 0, .screen_on = nullptr}; diff --git a/health/utils/libhealthloop/utils.cpp b/health/utils/libhealthloop/utils.cpp index 053fd19fe2..cd8c7a9ce4 100644 --- a/health/utils/libhealthloop/utils.cpp +++ b/health/utils/libhealthloop/utils.cpp @@ -28,21 +28,6 @@ void InitHealthdConfig(struct healthd_config* healthd_config) { *healthd_config = { .periodic_chores_interval_fast = DEFAULT_PERIODIC_CHORES_INTERVAL_FAST, .periodic_chores_interval_slow = DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW, - .batteryStatusPath = String8(String8::kEmptyString), - .batteryHealthPath = String8(String8::kEmptyString), - .batteryPresentPath = String8(String8::kEmptyString), - .batteryCapacityPath = String8(String8::kEmptyString), - .batteryVoltagePath = String8(String8::kEmptyString), - .batteryTemperaturePath = String8(String8::kEmptyString), - .batteryTechnologyPath = String8(String8::kEmptyString), - .batteryCurrentNowPath = String8(String8::kEmptyString), - .batteryCurrentAvgPath = String8(String8::kEmptyString), - .batteryChargeCounterPath = String8(String8::kEmptyString), - .batteryFullChargePath = String8(String8::kEmptyString), - .batteryCycleCountPath = String8(String8::kEmptyString), - .batteryCapacityLevelPath = String8(String8::kEmptyString), - .batteryChargeTimeToFullNowPath = String8(String8::kEmptyString), - .batteryFullChargeDesignCapacityUahPath = String8(String8::kEmptyString), .energyCounter = NULL, .boot_min_cap = 0, .screen_on = NULL,