Merge "Remove bugfix text flags." into main (5268d622) · Commits · e / os / android_frameworks_base

core/java/android/text/flags/flags.aconfig

+0 −31

Original line number	Diff line number	Diff line
		@@ -83,17 +83,6 @@ flag {
		bug: "297962571"
		}

		flag {
		name: "fix_font_update_failure"
		namespace: "text"
		description: "There was a bug of updating system font from Android 13 to 14. This flag for fixing the migration failure."
		is_fixed_read_only: true
		bug: "331717791"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "fix_misaligned_context_menu"
		namespace: "text"
		@@ -153,26 +142,6 @@ flag {
		}
		}

		flag {
		name: "portuguese_hyphenator"
		namespace: "text"
		description: "Portuguese taiored hyphenator"
		bug: "344656282"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "dont_break_email_in_nobreak_tag"
		namespace: "text"
		description: "Prevent line break inside email."
		bug: "350691716"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "handwriting_gesture_with_transformation"
		namespace: "text"

services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java

+24 −37

Original line number	Diff line number	Diff line
		@@ -196,12 +196,7 @@ final class UpdatableFontDir {
		File signatureFile = new File(dir, FONT_SIGNATURE_FILE);
		if (!signatureFile.exists()) {
		Slog.i(TAG, "The signature file is missing.");
		if (com.android.text.flags.Flags.fixFontUpdateFailure()) {
		return;
		} else {
		FileUtils.deleteContentsAndDir(dir);
		continue;
		}
		}
		byte[] signature;
		try {
		@@ -226,17 +221,12 @@ final class UpdatableFontDir {

		FontFileInfo fontFileInfo = validateFontFile(fontFile, signature);
		if (fontConfig == null) {
		if (com.android.text.flags.Flags.fixFontUpdateFailure()) {
		// Use preinstalled font config for checking revision number.
		fontConfig = mConfigSupplier.apply(Collections.emptyMap());
		} else {
		fontConfig = getSystemFontConfig();
		}
		}
		addFileToMapIfSameOrNewer(fontFileInfo, fontConfig, true /* deleteOldFile */);
		}

		if (com.android.text.flags.Flags.fixFontUpdateFailure()) {
		// Treat as error if post script name of font family was not installed.
		for (int i = 0; i < config.fontFamilies.size(); ++i) {
		FontUpdateRequest.Family family = config.fontFamilies.get(i);
		@@ -260,7 +250,6 @@ final class UpdatableFontDir {
		return;
		}
		}
		}

		success = true;
		} catch (Throwable t) {
		@@ -273,12 +262,10 @@ final class UpdatableFontDir {
		mFontFileInfoMap.clear();
		mLastModifiedMillis = 0;
		FileUtils.deleteContents(mFilesDir);
		if (com.android.text.flags.Flags.fixFontUpdateFailure()) {
		mConfigFile.delete();
		}
		}
		}
		}

		/**
		* Applies multiple {@link FontUpdateRequest}s in transaction.

services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.graphics.fonts.SystemFonts;
		import android.os.FileUtils;
		import android.os.ParcelFileDescriptor;
		import android.platform.test.annotations.Presubmit;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.system.Os;
		@@ -41,8 +40,6 @@ import androidx.test.InstrumentationRegistry;
		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.text.flags.Flags;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Rule;
		@@ -1106,7 +1103,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1126,7 +1122,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1);
		@@ -1146,7 +1141,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf and bar.ttf
		installTestFontFile(2 /* numFonts /, 1 / version */);
		@@ -1166,7 +1160,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf and bar.ttf
		installTestFontFile(2 /* numFonts /, 1 / version */);
		@@ -1186,7 +1179,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureAllMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1206,7 +1198,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureAllMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1226,7 +1217,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureAllMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1246,7 +1236,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void signatureAllMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1266,7 +1255,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1286,7 +1274,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1);
		@@ -1306,7 +1293,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf and bar.ttf
		installTestFontFile(2 /* numFonts /, 1 / version */);
		@@ -1326,7 +1312,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf and bar.ttf
		installTestFontFile(2 /* numFonts /, 1 / version */);
		@@ -1346,7 +1331,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontAllMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1366,7 +1350,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontAllMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1386,7 +1369,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontAllMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1406,7 +1388,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontAllMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1426,7 +1407,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontDirAllMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1446,7 +1426,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontDirAllMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1466,7 +1445,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontDirAllMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1486,7 +1464,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void fontDirAllMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1506,7 +1483,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void dirContentAllMissingCase_fontFamilyInstalled_fontFamilyInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1527,7 +1503,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void dirContentAllMissingCase_fontFamilyInstalled_fontInstallLater() {
		// Install font families, foo.ttf, bar.ttf.
		installTestFontFamilies(1 /* version */);
		@@ -1548,7 +1523,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void dirContentAllMissingCase_fontFileInstalled_fontFamilyInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);
		@@ -1569,7 +1543,6 @@ public final class UpdatableFontDirTest {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_FIX_FONT_UPDATE_FAILURE)
		public void dirContentAllMissingCase_fontFileInstalled_fontFileInstallLater() {
		// Install font file, foo.ttf
		installTestFontFile(1 /* numFonts /, 1 / version */);