Snap for 7293377 from 2685813d1f33f4f99a99840eacf9271ebc1d2f53 to sc-release (782fcadc) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/graphics/perftests/TypefaceSerializationPerfTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.graphics.Typeface;
		import android.os.SharedMemory;
		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.util.ArrayMap;

		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;
		@@ -55,9 +56,10 @@ public class TypefaceSerializationPerfTest {
		ByteBuffer buffer = memory.mapReadOnly().order(ByteOrder.BIG_ENDIAN);
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

		ArrayMap<String, Typeface> out = new ArrayMap<>();
		while (state.keepRunning()) {
		buffer.position(0);
		Typeface.deserializeFontMap(buffer);
		Typeface.deserializeFontMap(buffer, out);
		}
		}

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14117,6 +14117,7 @@ package android.text {
		method @NonNull public java.io.File getFile();
		method @Nullable public String getFontFamilyName();
		method @NonNull public String getFontVariationSettings();
		method @NonNull public String getPostScriptName();
		method @NonNull public android.graphics.fonts.FontStyle getStyle();
		method public int getTtcIndex();
		method public void writeToParcel(@NonNull android.os.Parcel, int);

core/api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -999,7 +999,7 @@ package android.graphics {
		}

		public class Typeface {
		method @NonNull public static java.util.Map<java.lang.String,android.graphics.Typeface> deserializeFontMap(@NonNull java.nio.ByteBuffer) throws java.io.IOException;
		method @NonNull public static long[] deserializeFontMap(@NonNull java.nio.ByteBuffer, @NonNull java.util.Map<java.lang.String,android.graphics.Typeface>) throws java.io.IOException;
		method @Nullable public static android.os.SharedMemory getSystemFontMapSharedMemory();
		method @NonNull public static android.os.SharedMemory serializeFontMap(@NonNull java.util.Map<java.lang.String,android.graphics.Typeface>) throws android.system.ErrnoException, java.io.IOException;
		}
		@@ -2493,6 +2493,7 @@ package android.text {
		method @NonNull public java.io.File getFile();
		method @Nullable public String getFontFamilyName();
		method @NonNull public String getFontVariationSettings();
		method @NonNull public String getPostScriptName();
		method @NonNull public android.graphics.fonts.FontStyle getStyle();
		method public int getTtcIndex();
		method public void writeToParcel(@NonNull android.os.Parcel, int);

core/java/android/text/FontConfig.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -194,6 +194,7 @@ public final class FontConfig implements Parcelable {
		public static final class Font implements Parcelable {
		private final @NonNull File mFile;
		private final @Nullable File mOriginalFile;
		private final @NonNull String mPostScriptName;
		private final @NonNull FontStyle mStyle;
		private final @IntRange(from = 0) int mIndex;
		private final @NonNull String mFontVariationSettings;
		@@ -204,11 +205,12 @@ public final class FontConfig implements Parcelable {
		*
		* @hide Only system server can create this instance and passed via IPC.
		*/
		public Font(@NonNull File file, @Nullable File originalFile, @NonNull FontStyle style,
		@IntRange(from = 0) int index, @NonNull String fontVariationSettings,
		@Nullable String fontFamilyName) {
		public Font(@NonNull File file, @Nullable File originalFile, @NonNull String postScriptName,
		@NonNull FontStyle style, @IntRange(from = 0) int index,
		@NonNull String fontVariationSettings, @Nullable String fontFamilyName) {
		mFile = file;
		mOriginalFile = originalFile;
		mPostScriptName = postScriptName;
		mStyle = style;
		mIndex = index;
		mFontVariationSettings = fontVariationSettings;
		@@ -224,6 +226,7 @@ public final class FontConfig implements Parcelable {
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeString8(mFile.getAbsolutePath());
		dest.writeString8(mOriginalFile == null ? null : mOriginalFile.getAbsolutePath());
		dest.writeString8(mPostScriptName);
		dest.writeInt(mStyle.getWeight());
		dest.writeInt(mStyle.getSlant());
		dest.writeInt(mIndex);
		@@ -238,14 +241,15 @@ public final class FontConfig implements Parcelable {
		File path = new File(source.readString8());
		String originalPathStr = source.readString8();
		File originalPath = originalPathStr == null ? null : new File(originalPathStr);
		String postScriptName = source.readString8();
		int weight = source.readInt();
		int slant = source.readInt();
		int index = source.readInt();
		String varSettings = source.readString8();
		String fallback = source.readString8();

		return new Font(path, originalPath, new FontStyle(weight, slant), index,
		varSettings, fallback);
		return new Font(path, originalPath, postScriptName, new FontStyle(weight, slant),
		index, varSettings, fallback);
		}

		@Override
		@@ -313,6 +317,13 @@ public final class FontConfig implements Parcelable {
		return mIndex;
		}

		/**
		* Returns the PostScript name of this font.
		*/
		public @NonNull String getPostScriptName() {
		return mPostScriptName;
		}

		/**
		* Returns the list of axes associated to this font.
		* @deprecated Use getFontVariationSettings

core/res/res/values-ar/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2248,7 +2248,7 @@
		<item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> و<xliff:g id="COUNT_3">%d</xliff:g> ملف</item>
		<item quantity="one"><xliff:g id="FILE_NAME_0">%s</xliff:g> وملف (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
		</plurals>
		<string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"ليس هناك أشخاص مقترحون للمشاركة معهم"</string>
		<string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"ليس هناك أشخاص مقترحون للمشاركة معهم."</string>
		<string name="chooser_all_apps_button_label" msgid="3230427756238666328">"قائمة التطبيقات"</string>
		<string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"‏لم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا."</string>
		<string name="accessibility_system_action_home_label" msgid="3234748160850301870">"الشاشة الرئيسية"</string>