diff options
| author | Jeff Hamilton <jham@android.com> | 2011-04-03 21:12:13 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-04-03 21:13:17 -0500 |
| commit | 478eadc756466cc8438f0ba1db8e229fcd3a087a (patch) | |
| tree | c2d259b7a968408b7e5eb4e04881a07a7f2eb891 | |
| parent | 14ee140a21157c77bc65a59913d26a244c1adc98 (diff) | |
| download | android_packages_apps_Tag-478eadc756466cc8438f0ba1db8e229fcd3a087a.tar.gz android_packages_apps_Tag-478eadc756466cc8438f0ba1db8e229fcd3a087a.tar.bz2 android_packages_apps_Tag-478eadc756466cc8438f0ba1db8e229fcd3a087a.zip | |
Don't crash if the saved state is invalid.
Bug: 3429970
Change-Id: I0b2e82d0259b34dad9701cdef9645670863e0d70
| -rw-r--r-- | src/com/android/apps/tag/EditTagActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ public class EditTagActivity extends Activity implements OnClickListener, EditCa 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(); } |