commit 889de0b459c9cc6a3bd2b8a920aa6e07138a6818
author Christopher Tate <ctate@google.com> Mon Nov 17 21:09:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 17 21:09:58 2014 +0000
tree 4b750a95df184d0a88cfe7369cb346105f93d8ed
parent 31f6aaf48cd6cc0792f28f629187199af309808b
parent f75301f7b1c75207824fd7d9aab0f5936cb6e3ed

am f75301f7: am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev

* commit 'f75301f7b1c75207824fd7d9aab0f5936cb6e3ed':
  Don't crash just because invalid datasets were offered for restore

core/java/com/android/internal/backup/LocalTransport.java

diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java
index d8dffe0..044383e 100644
--- a/core/java/com/android/internal/backup/LocalTransport.java
+++ b/core/java/com/android/internal/backup/LocalTransport.java
@@ -35,6 +35,8 @@
 
 import com.android.org.bouncycastle.util.encoders.Base64;
 
+import libcore.io.IoUtils;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -559,11 +561,7 @@
     // Full restore handling
 
     private void resetFullRestoreState() {
-        try {
-        mCurFullRestoreStream.close();
-        } catch (IOException e) {
-            Log.w(TAG, "Unable to close full restore input stream");
-        }
+        IoUtils.closeQuietly(mCurFullRestoreStream);
         mCurFullRestoreStream = null;
         mFullRestoreSocketStream = null;
         mFullRestoreBuffer = null;