Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev

Author: TreeHugger Robot

services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java

@@ -124,12 +124,8 @@ private static class DataReader implements FileRotator.Reader {
         @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());
             }
         }
     }