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

Merge "Fix repeated calls into reportExtractedText" into pi-dev

Browse Source 
am: bcbdeb29c9

Change-Id: Ifd8cf131d7884b77c597fd3d95ff67ccf9c9ff7a
This commit is contained in:
Clara Bayarri
2018-06-06 07:48:50 -07:00
committed by android-build-merger
parent eacc81f7bb bcbdeb29c9
commit 1cf7c2e604
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/Editor.java
View File

@@ -1688,6 +1688,11 @@ public class Editor {
if (ims == null) { if (ims == null) {
return false; return false;
} }
final boolean wasContentChanged = ims.mContentChanged;
if (!wasContentChanged && !ims.mSelectionModeChanged) {
return false;
}
ims.mContentChanged = false;
ims.mSelectionModeChanged = false; ims.mSelectionModeChanged = false;
final ExtractedTextRequest req = ims.mExtractedTextRequest; final ExtractedTextRequest req = ims.mExtractedTextRequest;
if (req == null) { if (req == null) {
@@ -1703,7 +1708,7 @@ public class Editor {
+ " end=" + ims.mChangedEnd + " end=" + ims.mChangedEnd
+ " delta=" + ims.mChangedDelta); + " delta=" + ims.mChangedDelta);
} }
if (ims.mChangedStart < 0 && !ims.mContentChanged) { if (ims.mChangedStart < 0 && !wasContentChanged) {
ims.mChangedStart = EXTRACT_NOTHING; ims.mChangedStart = EXTRACT_NOTHING;
} }
if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd, if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd,