Merge "Fix crashes related to setSpan(-1 ... -1) errors"
This commit is contained in:
commit
8918cb46f6
1 changed files with 12 additions and 10 deletions
|
@ -925,6 +925,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
public static void latinIME_onWindowHidden(final int savedSelectionStart,
|
public static void latinIME_onWindowHidden(final int savedSelectionStart,
|
||||||
final int savedSelectionEnd, final InputConnection ic) {
|
final int savedSelectionEnd, final InputConnection ic) {
|
||||||
if (ic != null) {
|
if (ic != null) {
|
||||||
|
final Object[] values = new Object[2];
|
||||||
|
if (OUTPUT_ENTIRE_BUFFER) {
|
||||||
// Capture the TextView contents. This will trigger onUpdateSelection(), so we
|
// Capture the TextView contents. This will trigger onUpdateSelection(), so we
|
||||||
// set sLatinIMEExpectingUpdateSelection so that when onUpdateSelection() is called,
|
// set sLatinIMEExpectingUpdateSelection so that when onUpdateSelection() is called,
|
||||||
// it can tell that it was generated by the logging code, and not by the user, and
|
// it can tell that it was generated by the logging code, and not by the user, and
|
||||||
|
@ -932,11 +934,11 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
ic.beginBatchEdit();
|
ic.beginBatchEdit();
|
||||||
ic.performContextMenuAction(android.R.id.selectAll);
|
ic.performContextMenuAction(android.R.id.selectAll);
|
||||||
CharSequence charSequence = ic.getSelectedText(0);
|
CharSequence charSequence = ic.getSelectedText(0);
|
||||||
|
if (savedSelectionStart != -1 && savedSelectionEnd != -1) {
|
||||||
ic.setSelection(savedSelectionStart, savedSelectionEnd);
|
ic.setSelection(savedSelectionStart, savedSelectionEnd);
|
||||||
|
}
|
||||||
ic.endBatchEdit();
|
ic.endBatchEdit();
|
||||||
sLatinIMEExpectingUpdateSelection = true;
|
sLatinIMEExpectingUpdateSelection = true;
|
||||||
final Object[] values = new Object[2];
|
|
||||||
if (OUTPUT_ENTIRE_BUFFER) {
|
|
||||||
if (TextUtils.isEmpty(charSequence)) {
|
if (TextUtils.isEmpty(charSequence)) {
|
||||||
values[0] = false;
|
values[0] = false;
|
||||||
values[1] = "";
|
values[1] = "";
|
||||||
|
|
Loading…
Reference in a new issue