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

Commit 42ec6f38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "health: fix vts setChargingPolicy failing" am: 5d07cebb am:... 

Merge "health: fix vts setChargingPolicy failing" am: 5d07cebb am: 6680f324 am: ad21a268 am: b03d4738

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2499312



Change-Id: I2a181fe6f0e8cde2fbe4a082310fd3caf599538e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd3b3c22 b03d4738

health/aidl/vts/functional/VtsHalHealthTargetTest.cpp

+4 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ TEST_P(HealthAidl, setChargingPolicy) { 
    BatteryChargingPolicy value;



    /* set ChargingPolicy*/

    status = health->setChargingPolicy(static_cast<BatteryChargingPolicy>(2));  // LONG_LIFE

    status = health->setChargingPolicy(BatteryChargingPolicy::LONG_LIFE);

    ASSERT_THAT(status, AnyOf(IsOk(), ExceptionIs(EX_UNSUPPORTED_OPERATION)));

    if (!status.isOk()) return;
@@ -265,7 +265,9 @@ TEST_P(HealthAidl, setChargingPolicy) { 
    status = health->getChargingPolicy(&value);

    ASSERT_THAT(status, AnyOf(IsOk(), ExceptionIs(EX_UNSUPPORTED_OPERATION)));

    if (!status.isOk()) return;

    ASSERT_THAT(static_cast<int>(value), Eq(2));

    // the result of getChargingPolicy will be one of default(1), ADAPTIVE_AON(2)

    // ADAPTIVE_AC(3) or LONG_LIFE(4). default(1) means NOT_SUPPORT

    ASSERT_THAT(static_cast<int>(value), AnyOf(Eq(1), Eq(4)));

}



MATCHER(IsValidHealthData, "") {