diff options
| author | Elliott Hughes <enh@google.com> | 2018-10-08 11:10:11 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-10-08 11:15:52 -0700 |
| commit | 643268f325e2bda64248df24913f8b68c842c95a (patch) | |
| tree | 4ddf6fdaa71ad280a6df08821c15ce97955a4c64 /healthd | |
| parent | f3186de123c742166ec5e61b27b61af3ef929dfb (diff) | |
| download | system_core-643268f325e2bda64248df24913f8b68c842c95a.tar.gz system_core-643268f325e2bda64248df24913f8b68c842c95a.tar.bz2 system_core-643268f325e2bda64248df24913f8b68c842c95a.zip | |
Move system/core/ off NO_ERROR.
It causes trouble for Windows, and OK already exists.
Bug: N/A
Test: builds
Change-Id: Ida22fd658b0ebb259c710ba39049b07c9e495d9c
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/BatteryMonitor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 80c5afe0d..2a5667c37 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -357,7 +357,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { if (!mHealthdConfig->batteryChargeCounterPath.isEmpty()) { val->valueInt64 = getIntField(mHealthdConfig->batteryChargeCounterPath); - ret = NO_ERROR; + ret = OK; } else { ret = NAME_NOT_FOUND; } @@ -367,7 +367,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { if (!mHealthdConfig->batteryCurrentNowPath.isEmpty()) { val->valueInt64 = getIntField(mHealthdConfig->batteryCurrentNowPath); - ret = NO_ERROR; + ret = OK; } else { ret = NAME_NOT_FOUND; } @@ -377,7 +377,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { if (!mHealthdConfig->batteryCurrentAvgPath.isEmpty()) { val->valueInt64 = getIntField(mHealthdConfig->batteryCurrentAvgPath); - ret = NO_ERROR; + ret = OK; } else { ret = NAME_NOT_FOUND; } @@ -387,7 +387,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { if (!mHealthdConfig->batteryCapacityPath.isEmpty()) { val->valueInt64 = getIntField(mHealthdConfig->batteryCapacityPath); - ret = NO_ERROR; + ret = OK; } else { ret = NAME_NOT_FOUND; } @@ -403,7 +403,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { case BATTERY_PROP_BATTERY_STATUS: val->valueInt64 = getChargeStatus(); - ret = NO_ERROR; + ret = OK; break; default: |