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

am 2d743fe2: merge from open-source master

Browse Source 
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
This commit is contained in:
The Android Open Source Project
2010-06-04 12:58:09 -07:00
committed by Android Git Automerger
parent f8acea6ccb 2d743fe2f3
commit 7c035d8a65
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/webkit/WebView.java
View File

@@ -1380,16 +1380,23 @@ public class WebView extends AbsoluteLayout
final File temp = new File(dest.getPath() + ".writing");
new Thread(new Runnable() {
public void run() {
FileOutputStream out = null;
try {
FileOutputStream out = new FileOutputStream(temp);
out = new FileOutputStream(temp);
p.writeToStream(out);
out.close();
// Writing the picture succeeded, rename the temporary file
// to the destination.
temp.renameTo(dest);
} catch (Exception e) {
// too late to do anything about it.
} finally {
if (out != null) {
try {
out.close();
} catch (Exception e) {
// Can't do anything about that
}
}
temp.delete();
}
}
@@ -1442,20 +1449,23 @@ public class WebView extends AbsoluteLayout
final Bundle copy = new Bundle(b);
new Thread(new Runnable() {
public void run() {
final Picture p = Picture.createFromStream(in);
if (p != null) {
// Post a runnable on the main thread to update the
// history picture fields.
mPrivateHandler.post(new Runnable() {
public void run() {
restoreHistoryPictureFields(p, copy);
}
});
}
try {
in.close();
} catch (Exception e) {
// Nothing we can do now.
final Picture p = Picture.createFromStream(in);
if (p != null) {
// Post a runnable on the main thread to update the
// history picture fields.
mPrivateHandler.post(new Runnable() {
public void run() {
restoreHistoryPictureFields(p, copy);
}
});
}
} finally {
try {
in.close();
} catch (Exception e) {
// Nothing we can do now.
}
}
}
}).start();