commit 91b9c58675e5d1aa43b7243a38510ebb16e14b25
author Jeff Hamilton <jham@android.com> Sun Apr 03 21:12:13 2011 -0500
committer android-merger <android-build@android.com> Wed Apr 06 13:42:07 2011 -0700
tree c2d259b7a968408b7e5eb4e04881a07a7f2eb891
parent 0472a7359810af54637f81b20949b2ed236628b5

Don't crash if the saved state is invalid.

Bug: 3429970
Change-Id: I0b2e82d0259b34dad9701cdef9645670863e0d70

src/com/android/apps/tag/EditTagActivity.java

diff --git a/src/com/android/apps/tag/EditTagActivity.java b/src/com/android/apps/tag/EditTagActivity.java
index e04421c..4755ea8 100644
--- a/src/com/android/apps/tag/EditTagActivity.java
+++ b/src/com/android/apps/tag/EditTagActivity.java
@@ -105,7 +105,12 @@
 
         if (savedState != null) {
             mRecord = savedState.getParcelable(BUNDLE_KEY_RECORD);
-            refresh();
+            if (mRecord != null) {
+                refresh();
+            } else {
+                Log.w(LOG_TAG, "invalid instance state, loading from intent");
+                resolveIntent();
+            }
         } else {
             resolveIntent();
         }