commit 7b705a37cc12463f3a028448530dcef2e70df66e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 01 00:04:51 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 01 00:04:51 2018 +0000
tree 1a3b508e5c2b2b686afd24c5a272b51809282f8e
parent b9df101c9eac5ce534f274c04913e54ea2c3de1d
parent 9d04f3ee11e863e215c47d569f519e4d4aff5e9f

Merge "Remove mFamilies from Typeface"

graphics/java/android/graphics/Typeface.java

diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 3933f50..dbe6e8f 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -163,9 +163,6 @@
     private int[] mSupportedAxes;
     private static final int[] EMPTY_AXES = {};
 
-    // The underlying font families.
-    private final FontFamily[] mFamilies;
-
     @UnsupportedAppUsage
     private static void setDefault(Typeface t) {
         sDefaultTypeface = t;
@@ -732,21 +729,17 @@
         public Typeface build() {
             final int userFallbackSize = mFamilies.size();
             final FontFamily[] fallback = SystemFonts.getSystemFallback(mFallbackName);
-            final FontFamily[] fullFamilies = new FontFamily[fallback.length + userFallbackSize];
             final long[] ptrArray = new long[fallback.length + userFallbackSize];
             for (int i = 0; i < userFallbackSize; ++i) {
                 ptrArray[i] = mFamilies.get(i).getNativePtr();
-                fullFamilies[i] = mFamilies.get(i);
             }
             for (int i = 0; i < fallback.length; ++i) {
                 ptrArray[i + userFallbackSize] = fallback[i].getNativePtr();
-                fullFamilies[i + userFallbackSize] = fallback[i];
             }
             final int weight = mStyle == null ? 400 : mStyle.getWeight();
             final int italic =
                     (mStyle == null || mStyle.getSlant() == FontStyle.FONT_SLANT_UPRIGHT) ?  0 : 1;
-
-            return new Typeface(nativeCreateFromArray(ptrArray, weight, italic), fullFamilies);
+            return new Typeface(nativeCreateFromArray(ptrArray, weight, italic));
         }
     }
 
@@ -811,7 +804,7 @@
                 }
             }
 
-            typeface = new Typeface(nativeCreateFromTypeface(ni, style), family.mFamilies);
+            typeface = new Typeface(nativeCreateFromTypeface(ni, style));
             styles.put(style, typeface);
         }
         return typeface;
@@ -879,8 +872,7 @@
             }
 
             typeface = new Typeface(
-                    nativeCreateFromTypefaceWithExactStyle(
-                            base.native_instance, weight, italic), base.mFamilies);
+                    nativeCreateFromTypefaceWithExactStyle(base.native_instance, weight, italic));
             innerCache.put(key, typeface);
         }
         return typeface;
@@ -890,8 +882,7 @@
     public static Typeface createFromTypefaceWithVariation(@Nullable Typeface family,
             @NonNull List<FontVariationAxis> axes) {
         final Typeface base = family == null ? Typeface.DEFAULT : family;
-        return new Typeface(nativeCreateFromTypefaceWithVariation(base.native_instance, axes),
-                base.mFamilies);
+        return new Typeface(nativeCreateFromTypefaceWithVariation(base.native_instance, axes));
     }
 
     /**
@@ -997,7 +988,7 @@
             ptrArray[i] = families[i].getNativePtr();
         }
         return new Typeface(nativeCreateFromArray(ptrArray,
-                  RESOLVE_BY_FONT_TABLE, RESOLVE_BY_FONT_TABLE), families);
+                  RESOLVE_BY_FONT_TABLE, RESOLVE_BY_FONT_TABLE));
     }
 
     /**
@@ -1045,19 +1036,6 @@
         }
 
         native_instance = ni;
-        mFamilies = new FontFamily[0];
-        sRegistry.registerNativeAllocation(this, native_instance);
-        mStyle = nativeGetStyle(ni);
-        mWeight = nativeGetWeight(ni);
-    }
-
-    private Typeface(long ni, @NonNull FontFamily[] families) {
-        if (ni == 0) {
-            throw new IllegalStateException("native typeface cannot be made");
-        }
-
-        native_instance = ni;
-        mFamilies = families;
         sRegistry.registerNativeAllocation(this, native_instance);
         mStyle = nativeGetStyle(ni);
         mWeight = nativeGetWeight(ni);
@@ -1084,8 +1062,7 @@
             final Typeface base = systemFontMap.get(alias.getToName());
             final int weight = alias.getWeight();
             final Typeface newFace = weight == 400 ? base :
-                    new Typeface(nativeCreateWeightAlias(base.native_instance, weight),
-                            base.mFamilies);
+                    new Typeface(nativeCreateWeightAlias(base.native_instance, weight));
             systemFontMap.put(alias.getName(), newFace);
         }
     }