Merge "Remove unused Typeface.getFallback()." (0c03b0e4) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Typeface.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -1557,16 +1557,6 @@ public class Typeface {
		return Arrays.binarySearch(mSupportedAxes, axis) >= 0;
		}

		/** @hide */
		public List<FontFamily> getFallback() {
		ArrayList<FontFamily> families = new ArrayList<>();
		int familySize = nativeGetFamilySize(native_instance);
		for (int i = 0; i < familySize; ++i) {
		families.add(new FontFamily(nativeGetFamily(native_instance, i)));
		}
		return families;
		}

		private static native long nativeCreateFromTypeface(long native_instance, int style);
		private static native long nativeCreateFromTypefaceWithExactStyle(
		long native_instance, int weight, boolean italic);
		@@ -1592,13 +1582,6 @@ public class Typeface {
		@CriticalNative
		private static native long nativeGetReleaseFunc();

		@CriticalNative
		private static native int nativeGetFamilySize(long naitvePtr);

		@CriticalNative
		private static native long nativeGetFamily(long nativePtr, int index);


		private static native void nativeRegisterGenericFamily(String str, long nativePtr);

		private static native int nativeWriteTypefaces(

+0 −14

Original line number	Diff line number	Diff line
		@@ -380,18 +380,6 @@ static void Typeface_forceSetStaticFinalField(JNIEnv *env, jclass cls, jstring f
		env->SetStaticObjectField(cls, fid, typeface);
		}

		// Critical Native
		static jint Typeface_getFamilySize(CRITICAL_JNI_PARAMS_COMMA jlong faceHandle) {
		return toTypeface(faceHandle)->fFontCollection->getFamilyCount();
		}

		// Critical Native
		static jlong Typeface_getFamily(CRITICAL_JNI_PARAMS_COMMA jlong faceHandle, jint index) {
		std::shared_ptr<minikin::FontFamily> family =
		toTypeface(faceHandle)->fFontCollection->getFamilyAt(index);
		return reinterpret_cast<jlong>(new FontFamilyWrapper(std::move(family)));
		}

		// Regular JNI
		static void Typeface_warmUpCache(JNIEnv* env, jobject, jstring jFilePath) {
		ScopedUtfChars filePath(env, jFilePath);
		@@ -431,8 +419,6 @@ static const JNINativeMethod gTypefaceMethods[] = {
		{"nativeReadTypefaces", "(Ljava/nio/ByteBuffer;I)[J", (void*)Typeface_readTypefaces},
		{"nativeForceSetStaticFinalField", "(Ljava/lang/String;Landroid/graphics/Typeface;)V",
		(void*)Typeface_forceSetStaticFinalField},
		{"nativeGetFamilySize", "(J)I", (void*)Typeface_getFamilySize},
		{"nativeGetFamily", "(JI)J", (void*)Typeface_getFamily},
		{"nativeWarmUpCache", "(Ljava/lang/String;)V", (void*)Typeface_warmUpCache},
		{"nativeAddFontCollections", "(J)V", (void*)Typeface_addFontCollection},
		{"nativeRegisterLocaleList", "(Ljava/lang/String;)V", (void*)Typeface_registerLocaleList},