commit 26bebab15e925f887ed2f85bccda03083a182289
author John Reck <jreck@google.com> Wed May 16 17:14:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 17:14:25 2012 -0700
tree e15e3506c2d7d900b19129c5b8a6e6caad43cd05
parent fe9356329710e8fae22bb3dc5f6aea86ae3cb87e
parent 0ec3e9fae2fdaddfd4f13bc83059cf4c856d2cc9

Merge "Monkey" into jb-dev

src/com/android/browser/BrowserActivity.java

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 @@
         if (LOGV_ENABLED) {
             Log.v(LOGTAG, "BrowserActivity.onSaveInstanceState: this=" + this);
         }
-        mController.onSaveInstanceState(outState);
+        if (mController != null) {
+            mController.onSaveInstanceState(outState);
+        }
     }
 
     @Override