diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 679a6a5b407db..554b6f1ba6c02 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -330,16 +330,16 @@ NotoSansSymbols-Regular-Subsetted.ttf - NotoSansCJK-Regular.ttc + NotoSansCJK-Regular.ttc - NotoSansCJK-Regular.ttc + NotoSansCJK-Regular.ttc - NotoSansCJK-Regular.ttc + NotoSansCJK-Regular.ttc - NotoSansCJK-Regular.ttc + NotoSansCJK-Regular.ttc NanumGothic.ttf diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index 2596f53cb9f43..774f6b8922e03 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -114,7 +114,7 @@ public class FontListParser { if (parser.getEventType() != XmlPullParser.START_TAG) continue; String tag = parser.getName(); if (tag.equals("font")) { - String ttcIndexStr = parser.getAttributeValue(null, "ttcIndex"); + String ttcIndexStr = parser.getAttributeValue(null, "index"); int ttcIndex = ttcIndexStr == null ? 0 : Integer.parseInt(ttcIndexStr); String weightStr = parser.getAttributeValue(null, "weight"); int weight = weightStr == null ? 400 : Integer.parseInt(weightStr);