Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4eb3c1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I122947a6ab6001709cfb28f41c43cff90159adb3
parents b73c29a1 b1c1ae95

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -124,12 +124,8 @@ public class PowerStatsDataStorage { 
        @Override

        @Override

        public void read(InputStream in) throws IOException {

        public void read(InputStream in) throws IOException {

            while (in.available() > 0) {

            while (in.available() > 0) {

                try {

                DataElement dataElement = new DataElement(in);

                DataElement dataElement = new DataElement(in);

                mCallback.onReadDataElement(dataElement.getData());

                mCallback.onReadDataElement(dataElement.getData());

                } catch (IOException e) {

                    Slog.e(TAG, "Failed to read from storage. " + e.getMessage());

                }

            }

            }

        }

        }

    }

    }