Merge "return false if any exception is thrown from savePicture" (e354bba5) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -1254,20 +1254,19 @@ public class WebView extends AbsoluteLayout
		final FileOutputStream out = new FileOutputStream(dest);
		p.writeToStream(out);
		out.close();
		} catch (FileNotFoundException e){
		e.printStackTrace();
		} catch (IOException e) {
		e.printStackTrace();
		} catch (RuntimeException e) {
		e.printStackTrace();
		}
		if (dest.length() > 0) {
		// now update the bundle
		b.putInt("scrollX", mScrollX);
		b.putInt("scrollY", mScrollY);
		b.putFloat("scale", mActualScale);
		b.putFloat("textwrapScale", mTextWrapScale);
		b.putBoolean("overview", mInZoomOverview);
		return true;
		} catch (FileNotFoundException e){
		e.printStackTrace();
		} catch (IOException e) {
		e.printStackTrace();
		} catch (RuntimeException e) {
		e.printStackTrace();
		}
		return false;
		}