Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43a959d9 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android Build Coastguard Worker
Browse files

Revert "Fix crash due to inconsistent handling of CR" 

Revert submission 26688908-fix_crash_with_cr

Reason for revert: This causes another crash in case of empty text.

Reverted changes: /q/submissionid:26688908-fix_crash_with_cr
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f85f7850d95607885964baa1cc27b17b0acc2b20)
Merged-In: I876d2ea7b3b9cc7da6b166d18d39dd866d4edb4f
Change-Id: I876d2ea7b3b9cc7da6b166d18d39dd866d4edb4f
parent 8c98e68c

core/java/android/text/MeasuredParagraph.java

+0 −16
Original line number Diff line number Diff line
@@ -700,22 +700,6 @@ public class MeasuredParagraph { 
                bidiRequest = isRtl ? Bidi.RTL : Bidi.LTR;

            }

            mBidi = new Bidi(mCopiedBuffer, 0, null, 0, mCopiedBuffer.length, bidiRequest);



            if (mBidi.getParagraphIndex(mCopiedBuffer.length - 1) != 0) {

                // Historically, the MeasuredParagraph does not treat the CR letters as paragraph

                // breaker but ICU BiDi treats it as paragraph breaker. In the MeasureParagraph,

                // the given range always represents a single paragraph, so if the BiDi object has

                // multiple paragraph, it should contains a CR letters in the text. Using CR is not

                // common in Android and also it should not penalize the easy case, e.g. all LTR,

                // check the paragraph count here and replace the CR letters and re-calculate

                // BiDi again.

                for (int i = 0; i < mTextLength; ++i) {

                    if (mCopiedBuffer[i] == '\r') {

                        mCopiedBuffer[i] = OBJECT_REPLACEMENT_CHARACTER;

                    }

                }

                mBidi = new Bidi(mCopiedBuffer, 0, null, 0, mCopiedBuffer.length, bidiRequest);

            }

            mLevels.resize(mTextLength);

            byte[] rawArray = mLevels.getRawArray();

            for (int i = 0; i < mTextLength; ++i) {