commit b25f78332afbb3242bee61c7b7be37fefbdd7c7e
author John Reck <jreck@google.com> Fri Nov 11 15:13:52 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 11 15:13:52 2011 +0000
tree adfddcf1f88a31852f4099a4526b9a06f82dcf37
parent e915522070010656582d4c651ab74b1ac4a94ac5
parent 897b8838bb59fa89226a4b72e27571eefe43ca60

am 897b8838: Merge "Handle error condition when inserting snapshots" into ics-mr1

* commit '897b8838bb59fa89226a4b72e27571eefe43ca60':
  Handle error condition when inserting snapshots

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 9710669..9402a77 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1624,12 +1624,20 @@
                         @Override
                         protected Long doInBackground(Tab... params) {
                             Uri result = cr.insert(Snapshots.CONTENT_URI, values);
+                            if (result == null) {
+                                return null;
+                            }
                             long id = ContentUris.parseId(result);
                             return id;
                         }
 
                         @Override
                         protected void onPostExecute(Long id) {
+                            if (id == null) {
+                                Toast.makeText(mActivity, R.string.snapshot_failed,
+                                        Toast.LENGTH_SHORT).show();
+                                return;
+                            }
                             Bundle b = new Bundle();
                             b.putLong(BrowserSnapshotPage.EXTRA_ANIMATE_ID, id);
                             mUi.showComboView(ComboViews.Snapshots, b);