diff options
| author | Elliott Slaughter <eds@google.com> | 2010-08-18 16:50:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-18 16:50:54 -0700 |
| commit | a5e672fea123026d1b26a8000a033bec527509ef (patch) | |
| tree | 44e41a91f144ff76672a195ca7c3915907f550da /src | |
| parent | d2362e746aa786ad49a0baf4253f99e883dab05e (diff) | |
| parent | 627d96f1564e9f95d8258958b35467057ff4c6b8 (diff) | |
| download | packages_apps_browser-a5e672fea123026d1b26a8000a033bec527509ef.zip packages_apps_browser-a5e672fea123026d1b26a8000a033bec527509ef.tar.gz packages_apps_browser-a5e672fea123026d1b26a8000a033bec527509ef.tar.bz2 | |
Merge "Fix Browser crash on search in new Browser session."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 4461cf0..50f4189 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -638,7 +638,7 @@ public class BrowserActivity extends Activity final ContentResolver cr = mResolver; final String newUrl = url; - if (!mTabControl.getCurrentWebView().isPrivateBrowsingEnabled()) { + if (mTabControl == null || !mTabControl.getCurrentWebView().isPrivateBrowsingEnabled()) { new AsyncTask<Void, Void, Void>() { @Override protected Void doInBackground(Void... unused) { |