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

Commit a4931f9b authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Use design capacity instead of full charge capacity" am: 25c2de29 

Change-Id: I4bba155589be27ed8f5c39f5dee8b2e0c57d8566
parents 2756a9f5 25c2de29

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -622,7 +622,7 @@ dd377f404a8e71f6191d295e10067db629b0f0c28e594af906f2bea5d87fe2cc android.hardwar 
f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice

f284ffde7cadf5a1364b75ab313baf22401eeca289bdde2a2dc7a27ea4ab98d7 android.hardware.dumpstate@1.1::IDumpstateDevice

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardware.health@2.1::IHealth

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

26f04510a0b57aba5167c5c0a7c2f077c2acbb98b81902a072517829fd9fd67f android.hardware.health@2.1::IHealthInfoCallback

db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types

30e5d878099aeca710420dfc438d115bbbdcdbe84ad1b05a0f5e01debc3ef3af android.hardware.health@2.1::types

0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types

0589e410f519e36514e7ece18f283f022df0f70efd2c12821d822f67f74aba98 android.hardware.identity@1.0::types

bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential

bbeee9604128ede83ee755b67e73b5ad29e6e1dbac9ec41fea6ffe2745b0c50a android.hardware.identity@1.0::IIdentityCredential

96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

96ce8aad80f4c476f25261f790d357c117e79e18474c7dadd850dac704bbe65e android.hardware.identity@1.0::IIdentityCredentialStore

health/2.1/types.hal

+4 −4
Original line number Original line Diff line number Diff line
@@ -84,12 +84,12 @@ struct HealthInfo { 
    int64_t batteryChargeTimeToFullNowSeconds;

    int64_t batteryChargeTimeToFullNowSeconds;





    /**

    /**

     * Estimated battery full capacity (in microamp hours, uAh).

     * Estimated battery full charge design capacity (in microamp hours, uAh).

     * batteryFullCharge must be less than (value * 1000).

     * Value must be 0 if unknown.

     * Value must be 0 if unknown.

     * Value must be positive if known, and must be between [50%, 120%] of

     * Value must be positive if known.

     * batteryFullCharge (the designed capacity).

     */

     */

    int32_t batteryFullCapacityUah;

    int32_t batteryFullChargeDesignCapacityUah;

};

};





/**

/**

health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp

+7 −6
Original line number Original line Diff line number Diff line
@@ -228,17 +228,18 @@ TEST_P(HealthHidlTest, getHealthInfo_2_1) { 
            return;

            return;

        }

        }

        ASSERT_EQ(Result::SUCCESS, result);

        ASSERT_EQ(Result::SUCCESS, result);

        const auto& legacy = value.legacy.legacy;





        EXPECT_TRUE(IsEnum(value.batteryCapacityLevel)) << " BatteryCapacityLevel";

        EXPECT_TRUE(IsEnum(value.batteryCapacityLevel)) << " BatteryCapacityLevel";

        EXPECT_GE(value.batteryChargeTimeToFullNowSeconds, 0);

        EXPECT_GE(value.batteryChargeTimeToFullNowSeconds, 0);





        EXPECT_GE(value.batteryFullCapacityUah, 0)

        EXPECT_GE(value.batteryFullChargeDesignCapacityUah, 0)

                << "batteryFullCapacityUah should not be negative";

                << "batteryFullChargeDesignCapacityUah should not be negative";





        if (value.batteryFullCapacityUah > 0) {

        // Check for extreme outliers

            EXPECT_GE(value.batteryFullCapacityUah, legacy.batteryFullCharge * 0.50);

        const auto& legacy = value.legacy.legacy;

            EXPECT_LE(value.batteryFullCapacityUah, legacy.batteryFullCharge * 1.20);

        if (value.batteryFullChargeDesignCapacityUah > 0) {

            EXPECT_LT((long)legacy.batteryFullCharge,

                      ((long)value.batteryFullChargeDesignCapacityUah * 1000));

        }

        }

    })));

    })));

}

}

health/utils/libhealthloop/utils.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ void InitHealthdConfig(struct healthd_config* healthd_config) { 
            .batteryCycleCountPath = String8(String8::kEmptyString),

            .batteryCycleCountPath = String8(String8::kEmptyString),

            .batteryCapacityLevelPath = String8(String8::kEmptyString),

            .batteryCapacityLevelPath = String8(String8::kEmptyString),

            .batteryChargeTimeToFullNowPath = String8(String8::kEmptyString),

            .batteryChargeTimeToFullNowPath = String8(String8::kEmptyString),

            .batteryFullChargeDesignCapacityUahPath = String8(String8::kEmptyString),

            .energyCounter = NULL,

            .energyCounter = NULL,

            .boot_min_cap = 0,

            .boot_min_cap = 0,

            .screen_on = NULL,

            .screen_on = NULL,