commit c14893bf5a2ad76ad6279f09b66020610e32041f
author Nimrod Gileadi <nimrod@google.com> Wed Mar 02 09:17:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 02 09:17:21 2016 +0000
tree 6da3b8fb79e913f9e0a2bc257f87df97a0cb89d2
parent 0d26fdb6cd3c4637ec2c4db7467c739991285a0b
parent e9be5da68640507d4986ce4294398da0083b0df5

Merge "Close InputStream in BatteryStatsHelper" into nyc-dev

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

diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java
index f178c8c..1b52146 100644
--- a/core/java/com/android/internal/os/BatteryStatsHelper.java
+++ b/core/java/com/android/internal/os/BatteryStatsHelper.java
@@ -754,8 +754,7 @@
         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);