summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-09 14:11:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-09 14:11:01 -0700
commit5ff1d94f213775a471028e1aa8c5b515cf550682 (patch)
tree1ed3118e85981015af03468809a77844a81a00a6
parentb159fa22067330a4a860a87b10fa1c47cb1b3a18 (diff)
parent40e7f350e0aee6308b03d206721fcf80cfff051f (diff)
downloadpackages_apps_Browser-5ff1d94f213775a471028e1aa8c5b515cf550682.zip
packages_apps_Browser-5ff1d94f213775a471028e1aa8c5b515cf550682.tar.gz
packages_apps_Browser-5ff1d94f213775a471028e1aa8c5b515cf550682.tar.bz2
am 40e7f350: Monkey
* commit '40e7f350e0aee6308b03d206721fcf80cfff051f': Monkey
-rw-r--r--src/com/android/browser/BrowserActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1d53626..cb475b7 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -193,7 +193,9 @@ public class BrowserActivity extends Activity {
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- mController.onConfgurationChanged(newConfig);
+ if (mController != null) {
+ mController.onConfgurationChanged(newConfig);
+ }
}
@Override