mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-20 05:14:32 -05:00
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
From 34d287505f8c992b1ba3416b89fca16482123e48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Seigo Nonaka <nona@google.com>
|
||
|
|
Date: Mon, 16 Sep 2019 14:49:49 -0700
|
||
|
|
Subject: [PATCH] Do not compute outside given range in TextLine
|
||
|
|
|
||
|
|
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
|
||
|
|
which breaks various layout test on application.
|
||
|
|
The empty string must be also handled by the TextLine since it
|
||
|
|
retrieves the default line height from the empty string.
|
||
|
|
|
||
|
|
Bug: 140632678
|
||
|
|
Test: StaticLayoutTest
|
||
|
|
Test: Manually done
|
||
|
|
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
|
||
|
|
---
|
||
|
|
core/java/android/text/TextLine.java | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java
|
||
|
|
index 1fecf81d5a4f..712007ed0577 100644
|
||
|
|
--- a/core/java/android/text/TextLine.java
|
||
|
|
+++ b/core/java/android/text/TextLine.java
|
||
|
|
@@ -206,6 +206,7 @@ void draw(Canvas c, float x, int top, int y, int bottom) {
|
||
|
|
int lastRunIndex = runs.length - 2;
|
||
|
|
for (int i = 0; i < runs.length; i += 2) {
|
||
|
|
int runStart = runs[i];
|
||
|
|
+ if (runStart > mLen) break;
|
||
|
|
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
|
||
|
|
if (runLimit > mLen) {
|
||
|
|
runLimit = mLen;
|
||
|
|
@@ -301,6 +302,7 @@ float measure(int offset, boolean trailing, FontMetricsInt fmi) {
|
||
|
|
int[] runs = mDirections.mDirections;
|
||
|
|
for (int i = 0; i < runs.length; i += 2) {
|
||
|
|
int runStart = runs[i];
|
||
|
|
+ if (runStart > mLen) break;
|
||
|
|
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
|
||
|
|
if (runLimit > mLen) {
|
||
|
|
runLimit = mLen;
|