summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wachenschwanz <mwachens@google.com> 2021-07-26 22:27:50 -0700
committer Michael Wachenschwanz <mwachens@google.com> 2021-07-26 22:27:50 -0700
commit9f6044a2bc608635d5d4ed037326d35ed35150ca (patch)
treec305dd7bf4b8f4ed579e0103f08c26cb0f8dfb4b
parent72922c8a85af2e0e834ff3de52d05510b191bddb (diff)
Don't resume PowerStatsDataStorage read on Exception
If there is a problem with the PowerStatsDataStorage file, the read should end, instead of catching the excpetion and resuming. Fixes: 192639542 Test: atest PowerStatsServiceTest (the logcat should not be spammed with many PowerStats errors) Change-Id: If2617ab13a8177b75142d52bcad458f80eb5ed2c
-rw-r--r--services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java b/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java
index 2a95416747a6..06253a08d937 100644
--- a/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java
+++ b/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java
@@ -124,12 +124,8 @@ public class PowerStatsDataStorage {
@Override
public void read(InputStream in) throws IOException {
while (in.available() > 0) {
- try {
- DataElement dataElement = new DataElement(in);
- mCallback.onReadDataElement(dataElement.getData());
- } catch (IOException e) {
- Slog.e(TAG, "Failed to read from storage. " + e.getMessage());
- }
+ DataElement dataElement = new DataElement(in);
+ mCallback.onReadDataElement(dataElement.getData());
}
}
}