Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b72053 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove String8(StaticLinkage) references." into rvc-dev am: 6e83f698 

Change-Id: I76f0d29fbc595b08cfcb3d3272b73e0890d14348
parents f6c812cd 6e83f698

health/2.0/default/HealthImplDefault.cpp

+0 −12
Original line number Diff line number Diff line
@@ -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};

health/utils/libhealthloop/utils.cpp

+0 −15
Original line number Diff line number Diff line
@@ -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,