Index: content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
index b1cabade8c8e4e2395098d7e02c186740b523dd7..d22352771e22a978a02a4484a1d5281bf49d1a32 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
@@ -431,7 +431,8 @@ public class BrowserAccessibilityManager { |
mSelectionEndIndex = -1; |
} |
mSelectionGranularity = granularity; |
- if (nativeIsEditableText(mNativeObj, mAccessibilityFocusId)) { |
+ if (nativeIsEditableText(mNativeObj, mAccessibilityFocusId) |
+ && nativeIsFocused(mNativeObj, mAccessibilityFocusId)) { |
mSelectionStartIndex = nativeGetEditableTextSelectionStart( |
mNativeObj, mAccessibilityFocusId); |
mSelectionEndIndex = nativeGetEditableTextSelectionEnd( |
@@ -479,7 +480,8 @@ public class BrowserAccessibilityManager { |
if (!extendSelection) { |
mSelectionStartIndex = mSelectionEndIndex; |
} |
- if (nativeIsEditableText(mNativeObj, mAccessibilityFocusId)) { |
+ if (nativeIsEditableText(mNativeObj, mAccessibilityFocusId) |
+ && nativeIsFocused(mNativeObj, mAccessibilityFocusId)) { |
nativeSetSelection(mNativeObj, mAccessibilityFocusId, |
mSelectionStartIndex, mSelectionEndIndex); |
} |
@@ -1163,6 +1165,8 @@ public class BrowserAccessibilityManager { |
private native boolean nativeIsNodeValid(long nativeBrowserAccessibilityManagerAndroid, int id); |
private native boolean nativeIsEditableText( |
long nativeBrowserAccessibilityManagerAndroid, int id); |
+ private native boolean nativeIsFocused( |
+ long nativeBrowserAccessibilityManagerAndroid, int id); |
private native int nativeGetEditableTextSelectionStart( |
long nativeBrowserAccessibilityManagerAndroid, int id); |
private native int nativeGetEditableTextSelectionEnd( |