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

Commit 2a65d6a2 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Android (Google) Code Review
Browse files

Merge "power/stats: Rename readEnergyMeters to readEnergyMeter" into sc-dev

parents 5f536631 77e678ce

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/IPowerStats.aidl

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ interface IPowerStats { 
  android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo();

  android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed(in int[] energyConsumerIds);

  android.hardware.power.stats.Channel[] getEnergyMeterInfo();

  android.hardware.power.stats.EnergyMeasurement[] readEnergyMeters(in int[] channelIds);

  android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(in int[] channelIds);

}

power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl

+2 −2
Original line number Diff line number Diff line
@@ -107,5 +107,5 @@ interface IPowerStats { 
     *  - STATUS_BAD_VALUE if an invalid channelId is provided

     *  - STATUS_FAILED_TRANSACTION if any EnergyMeasurement fails to be returned

     */

    EnergyMeasurement[] readEnergyMeters(in int[] channelIds);

    EnergyMeasurement[] readEnergyMeter(in int[] channelIds);

}

power/stats/aidl/default/PowerStats.cpp

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ ndk::ScopedAStatus PowerStats::getEnergyMeterInfo(std::vector<Channel>* _aidl_re 
    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus PowerStats::readEnergyMeters(const std::vector<int32_t>& in_channelIds,

ndk::ScopedAStatus PowerStats::readEnergyMeter(const std::vector<int32_t>& in_channelIds,

                                               std::vector<EnergyMeasurement>* _aidl_return) {

    (void)in_channelIds;

    (void)_aidl_return;

power/stats/aidl/default/PowerStats.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class PowerStats : public BnPowerStats { 
    ndk::ScopedAStatus getEnergyConsumed(const std::vector<int32_t>& in_energyConsumerIds,

                                         std::vector<EnergyConsumerResult>* _aidl_return) override;

    ndk::ScopedAStatus getEnergyMeterInfo(std::vector<Channel>* _aidl_return) override;

    ndk::ScopedAStatus readEnergyMeters(const std::vector<int32_t>& in_channelIds,

    ndk::ScopedAStatus readEnergyMeter(const std::vector<int32_t>& in_channelIds,

                                       std::vector<EnergyMeasurement>* _aidl_return) override;

};

power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ TEST_P(PowerStatsAidl, ValidateChannelUniqueIds) { 
// Reading energy meter must return a valid status

TEST_P(PowerStatsAidl, TestReadEnergyMeter) {

    std::vector<EnergyMeasurement> data;

    ASSERT_TRUE(powerstats->readEnergyMeters({}, &data).isOk());

    ASSERT_TRUE(powerstats->readEnergyMeter({}, &data).isOk());

}



// Reading energy meter must return results for all available channels
@@ -271,7 +271,7 @@ TEST_P(PowerStatsAidl, TestGetAllEnergyMeasurements) { 
    ASSERT_TRUE(powerstats->getEnergyMeterInfo(&channels).isOk());



    std::vector<EnergyMeasurement> measurements;

    ASSERT_TRUE(powerstats->readEnergyMeters({}, &measurements).isOk());

    ASSERT_TRUE(powerstats->readEnergyMeter({}, &measurements).isOk());



    testMatching(channels, &Channel::id, measurements, &EnergyMeasurement::id);

}
@@ -291,7 +291,7 @@ TEST_P(PowerStatsAidl, TestGetSelectedEnergyMeasurements) { 
    }



    std::vector<EnergyMeasurement> selectedMeasurements;

    ASSERT_TRUE(powerstats->readEnergyMeters(selectedIds, &selectedMeasurements).isOk());

    ASSERT_TRUE(powerstats->readEnergyMeter(selectedIds, &selectedMeasurements).isOk());



    testMatching(selectedChannels, &Channel::id, selectedMeasurements, &EnergyMeasurement::id);

}