diff options
| author | John Reck <jreck@google.com> | 2012-05-16 17:18:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-16 17:18:55 -0700 |
| commit | 292e53064af95d4974e8927b320d2ae08e9de2e7 (patch) | |
| tree | fd3da39c521cc043e08e77e07c7ef98a95f3f298 /src | |
| parent | 01ad856a7970f6983e5ec75fef0e492f81cc2936 (diff) | |
| parent | 26bebab15e925f887ed2f85bccda03083a182289 (diff) | |
| download | packages_apps_browser-292e53064af95d4974e8927b320d2ae08e9de2e7.zip packages_apps_browser-292e53064af95d4974e8927b320d2ae08e9de2e7.tar.gz packages_apps_browser-292e53064af95d4974e8927b320d2ae08e9de2e7.tar.bz2 | |
am 26bebab1: Merge "Monkey" into jb-dev
* commit '26bebab15e925f887ed2f85bccda03083a182289':
Monkey
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 |