Merge "Remove String8(StaticLinkage) references." am: 19b9aad80d
Change-Id: Ic98bb955e7adf20e954f015b456ea3c6a791c3ed
This commit is contained in:
commit
553896d8e7
2 changed files with 0 additions and 27 deletions
|
@ -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};
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue