diff options
| author | John Reck <jreck@google.com> | 2012-05-30 16:49:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-30 16:49:56 -0700 |
| commit | 48b66727485a789489568ad4fe0392c8d3f8e52d (patch) | |
| tree | e9cded3a4c91dfb1635e9d9827ef8c517ec55194 /src | |
| parent | 29457a67e8a8dcd4600a4ea50a3c092a0559a962 (diff) | |
| parent | ed19512a329e66afaf48c8346b823e5fcc73bd02 (diff) | |
| download | packages_apps_browser-48b66727485a789489568ad4fe0392c8d3f8e52d.zip packages_apps_browser-48b66727485a789489568ad4fe0392c8d3f8e52d.tar.gz packages_apps_browser-48b66727485a789489568ad4fe0392c8d3f8e52d.tar.bz2 | |
am ed19512a: Merge "Add null check" into jb-dev
* commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02':
Add null check
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/TitleBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index d3e8f7c..f5be5d3 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -406,7 +406,7 @@ public class TitleBar extends RelativeLayout { @Override public View focusSearch(View focused, int dir) { WebView web = getCurrentWebView(); - if (FOCUS_DOWN == dir && hasFocus() + if (FOCUS_DOWN == dir && hasFocus() && web != null && web.hasFocusable() && web.getParent() != null) { return web; } |