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

Fix getLineLeft crashes when alignment is null

Browse Source 
Bug: 119221721
Test: atest StaticLayoutGetLineLeftRightTest
Change-Id: If83ac95f47d76052cf088b7d977ee5cded9a8fee
This commit is contained in:
Haoyu Zhang
2018-11-13 15:05:58 -08:00
parent e6472fe56d
commit d1e6d2e3c6
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/text/Layout.java
View File

@@ -1270,7 +1270,13 @@ public abstract class Layout {
*/
public float getLineLeft(int line) {
final int dir = getParagraphDirection(line);
final Alignment align = getParagraphAlignment(line);
Alignment align = getParagraphAlignment(line);
// Before Q, StaticLayout.Builder.setAlignment didn't check whether the input alignment
// is null. And when it is null, the old behavior is the same as ALIGN_CENTER.
// To keep consistency, we convert a null alignment to ALIGN_CENTER.
if (align == null) {
align = Alignment.ALIGN_CENTER;
}
// First convert combinations of alignment and direction settings to
// three basic cases: ALIGN_LEFT, ALIGN_RIGHT and ALIGN_CENTER.
@@ -1319,7 +1325,13 @@ public abstract class Layout {
*/
public float getLineRight(int line) {
final int dir = getParagraphDirection(line);
final Alignment align = getParagraphAlignment(line);
Alignment align = getParagraphAlignment(line);
// Before Q, StaticLayout.Builder.setAlignment didn't check whether the input alignment
// is null. And when it is null, the old behavior is the same as ALIGN_CENTER.
// To keep consistency, we convert a null alignment to ALIGN_CENTER.
if (align == null) {
align = Alignment.ALIGN_CENTER;
}
final Alignment resultAlign;
switch(align) {