Commit: ee1a0f0cedf96f804e856b8100b75f49a12d9fc9 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revisión: ee1a0f0cedf96f804e856b8100b75f49a12d9fc9 (tree)
• Tiempo: 2018-08-31 05:34:10
• Autor: Seigo Nonaka <nona@goog...>
• Commiter: Ryan Longair

Log Message

Fix crash during cursor moving on BiDi text

The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.

To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.

Bug: 78464361, 111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit 82c84d5fbb692f5ed56175c55031e30566c18ee2)

Cambiar Resumen

• modified: core/java/android/text/Layout.java

Diferencia incremental

--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1390,7 +1390,8 @@ public abstract class Layout {
         }
 
         float get(final int offset) {
-            if (mHorizontals == null) {
+            if (mHorizontals == null || offset < mLineStartOffset
+                    || offset >= mLineStartOffset + mHorizontals.length) {
                 return getHorizontal(offset, mPrimary);
             } else {
                 return mHorizontals[offset - mLineStartOffset];