summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-08-13 02:46:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-13 02:46:54 +0000
commited4eb3c144b49fdf4bb490fc6adb117dda541737 (patch)
treea212920efe58d2fd62e187c3712b440813b5f354
parentb73c29a18a1ee63c7ae7aced7d42f4523f88c79a (diff)
parentb1c1ae9517f9dca77789eee7ce4116939c4c7da2 (diff)
Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825 Change-Id: I122947a6ab6001709cfb28f41c43cff90159adb3
-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());
}
}
}