Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2014-11-17 20:20:11 +00:00
committed by Android (Google) Code Review
parent 9d8c759879 824392bdbd
commit 94d963381d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/backup/LocalTransport.java
View File

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