commit b396aafa6922b61c69dafe1befae12ecf5d69867
author Yahan Zhou <yahan@google.com> Wed Nov 09 12:29:33 2016 -0800
committer Yahan Zhou <yahan@google.com> Wed Nov 09 12:35:31 2016 -0800
tree 6ea9186d97f6508e0982102fc543c62d5e6f7774
parent 12dda48ecde1597591b2273cc9199b017510c4ca

Use AutoCloseInputStream in BackupQuotaTest

Previously ParcelFileDescriptor might get closed before it needs to be
read. This patch uses AutoCloseInputStream instead, which will take care
of closing the file descriptor.

b/31807727

Change-Id: I14dc42a4c22a3a6fac069f36dee754ddd0708e5e

tests/backup/src/android/backup/cts/BackupQuotaTest.java

diff --git a/tests/backup/src/android/backup/cts/BackupQuotaTest.java b/tests/backup/src/android/backup/cts/BackupQuotaTest.java
index 6122ad0..01c368a 100644
--- a/tests/backup/src/android/backup/cts/BackupQuotaTest.java
+++ b/tests/backup/src/android/backup/cts/BackupQuotaTest.java
@@ -147,10 +147,6 @@
                 out.append(str);
             }
             return out.toString();
-        } finally {
-            if (br != null) {
-                closeQuietly(br);
-            }
         }
     }
 
@@ -158,7 +154,7 @@
                                                                String command) throws Exception {
         final ParcelFileDescriptor pfd =
                 instrumentation.getUiAutomation().executeShellCommand(command);
-        return new FileInputStream(pfd.getFileDescriptor());
+        return new ParcelFileDescriptor.AutoCloseInputStream(pfd);
     }
 
     private static void closeQuietly(AutoCloseable closeable) {