summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2019-10-24 18:50:51 -0700
committerSeigo Nonaka <nona@google.com>2019-10-29 19:53:35 +0000
commit01709c7469b59e451f064c266bbe442e9bef0ab4 (patch)
tree121acd626c47e6cec1f26b6576c37804f9ef5547 /graphics/java
parentd3ba36e31224d0037fb0497fbeaca0ee96f33fcd (diff)
Make AFont_getLocale work
There are multiple problems here: - Java Font.equals and hashCode doesn't look at locale list. Due to this issue, the CTS tests have been passing unexpectedly. - The null pointer check in the AFont_getLoacle was inversed. Should return only when it is non-null. - Looks like we cannot get the parent's attribute which always returns null. Instead, read the "lang" attribute when we read the family tag. Bug: 139201432 Test: atest NativeSystemFontTest Test: atest TypefaceEqualsTest Change-Id: I0514847bbf46a73358afab374ccfce2db09b2ec0
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/fonts/Font.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/fonts/Font.java b/graphics/java/android/graphics/fonts/Font.java
index 552088f7c478..ba96a06cc852 100644
--- a/graphics/java/android/graphics/fonts/Font.java
+++ b/graphics/java/android/graphics/fonts/Font.java
@@ -519,12 +519,13 @@ public final class Font {
}
Font f = (Font) o;
return mFontStyle.equals(f.mFontStyle) && f.mTtcIndex == mTtcIndex
- && Arrays.equals(f.mAxes, mAxes) && f.mBuffer.equals(mBuffer);
+ && Arrays.equals(f.mAxes, mAxes) && f.mBuffer.equals(mBuffer)
+ && Objects.equals(f.mLocaleList, mLocaleList);
}
@Override
public int hashCode() {
- return Objects.hash(mFontStyle, mTtcIndex, Arrays.hashCode(mAxes), mBuffer);
+ return Objects.hash(mFontStyle, mTtcIndex, Arrays.hashCode(mAxes), mBuffer, mLocaleList);
}
@Override