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

merge from open-source master

Browse Source 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
This commit is contained in:
The Android Open Source Project
2010-06-04 11:07:49 -07:00
parent e896d41699 fb59fbf14e
commit 2d743fe2f3
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"); final File temp = new File(dest.getPath() + ".writing");
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
FileOutputStream out = null;
try { try {
FileOutputStream out = new FileOutputStream(temp); out = new FileOutputStream(temp);
p.writeToStream(out); p.writeToStream(out);
out.close();
// Writing the picture succeeded, rename the temporary file // Writing the picture succeeded, rename the temporary file
// to the destination. // to the destination.
temp.renameTo(dest); temp.renameTo(dest);
} catch (Exception e) { } catch (Exception e) {
// too late to do anything about it. // too late to do anything about it.
} finally { } finally {
if (out != null) {
try {
out.close();
} catch (Exception e) {
// Can't do anything about that
}
}
temp.delete(); temp.delete();
} }
} }
@@ -1442,20 +1449,23 @@ public class WebView extends AbsoluteLayout
final Bundle copy = new Bundle(b); final Bundle copy = new Bundle(b);
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { 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 { try {
in.close(); final Picture p = Picture.createFromStream(in);
} catch (Exception e) { if (p != null) {
// Nothing we can do now. // 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(); }).start();