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

Commit 727b62a0 authored by Nimrod Gileadi's avatar Nimrod Gileadi Committed by android-build-merger
Browse files

Merge "Close InputStream in BatteryStatsHelper" into nyc-dev am: c14893bf 

am: a2f24a01

* commit 'a2f24a01':
  Close InputStream in BatteryStatsHelper
parents a9d74f30 a2f24a01

core/java/com/android/internal/os/BatteryStatsHelper.java

+1 −2
Original line number Diff line number Diff line
@@ -754,8 +754,7 @@ public final class BatteryStatsHelper { 
        try {

            ParcelFileDescriptor pfd = service.getStatisticsStream();

            if (pfd != null) {

                FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd);

                try {

                try (FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd)) {

                    byte[] data = readFully(fis, MemoryFile.getSize(pfd.getFileDescriptor()));

                    Parcel parcel = Parcel.obtain();

                    parcel.unmarshall(data, 0, data.length);