Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d64f4a98: DO NOT MERGE fix null check

Browse Source 
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
This commit is contained in:
Cary Clark
2010-08-25 13:53:05 -07:00
committed by Android Git Automerger
parent 96dc45597e d64f4a983d
commit 1ef41605bb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -3338,7 +3338,8 @@ public class WebView extends AbsoluteLayout
setUpSelect();
if (mNativeClass != 0 && nativeWordSelection(x, y)) {
nativeSetExtendSelection();
getWebChromeClient().onSelectionStart(this);
WebChromeClient client = getWebChromeClient();
if (client != null) client.onSelectionStart(this);
return true;
}
notifySelectDialogDismissed();
@@ -4136,7 +4137,8 @@ public class WebView extends AbsoluteLayout
*/
public void selectionDone() {
if (mSelectingText) {
getWebChromeClient().onSelectionDone(this);
WebChromeClient client = getWebChromeClient();
if (client != null) client.onSelectionDone(this);
invalidate(); // redraw without selection
notifySelectDialogDismissed();
}