diff options
| author | John Reck <jreck@google.com> | 2012-05-16 17:14:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 17:14:25 -0700 |
| commit | 26bebab15e925f887ed2f85bccda03083a182289 (patch) | |
| tree | e15e3506c2d7d900b19129c5b8a6e6caad43cd05 /src | |
| parent | fe9356329710e8fae22bb3dc5f6aea86ae3cb87e (diff) | |
| parent | 0ec3e9fae2fdaddfd4f13bc83059cf4c856d2cc9 (diff) | |
| download | packages_apps_Browser-26bebab15e925f887ed2f85bccda03083a182289.zip packages_apps_Browser-26bebab15e925f887ed2f85bccda03083a182289.tar.gz packages_apps_Browser-26bebab15e925f887ed2f85bccda03083a182289.tar.bz2 | |
Merge "Monkey" into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 4bb8107..b7217e9 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -166,7 +166,9 @@ public class BrowserActivity extends Activity { if (LOGV_ENABLED) { Log.v(LOGTAG, "BrowserActivity.onSaveInstanceState: this=" + this); } - mController.onSaveInstanceState(outState); + if (mController != null) { + mController.onSaveInstanceState(outState); + } } @Override |