commit be0e2ed7ae1ae0c996d163601fd9fe3150be30e6
author Benjamin Schwartz <bsschwar@google.com> Wed Mar 10 14:48:50 2021 -0800
committer Benjamin Schwartz <bsschwar@google.com> Thu Mar 11 10:47:51 2021 -0800
tree df80fb30940b260f6ec1abe08ef10b91e3925d35
parent 6e1ce4d3c9e002dc0c4d0b76e98e32cb99dd2557

power/stats: Return exception codes on error

Bug: 182406354
Bug: 181598864
Test: Presubmit
Change-Id: I00d359ce400d52e774ea43f1330b85775414f88c

power/stats/aidl/default/FakeEnergyMeter.h

diff --git a/power/stats/aidl/default/FakeEnergyMeter.h b/power/stats/aidl/default/FakeEnergyMeter.h
index f0d4ee7..56dcdcc 100644
--- a/power/stats/aidl/default/FakeEnergyMeter.h
+++ b/power/stats/aidl/default/FakeEnergyMeter.h
@@ -60,9 +60,12 @@
             *_aidl_return = mEnergyMeasurements;
         } else {
             for (int32_t id : in_channelIds) {
-                if (id >= 0 && id < mEnergyMeasurements.size()) {
-                    _aidl_return->push_back(mEnergyMeasurements[id]);
+                // check for invalid ids
+                if (id < 0 || id >= mEnergyMeasurements.size()) {
+                    return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_ILLEGAL_ARGUMENT));
                 }
+
+                _aidl_return->push_back(mEnergyMeasurements[id]);
             }
         }