Snap for 8557337 from bf7fddee01c116d2619535a1bca7d2cc3f163a62 to tm-release (3a1f3dd0) · Commits · e / os / android_frameworks_base

core/java/android/app/LocaleConfig.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,9 @@ import java.util.Set;
		* referenced in the manifest via {@code android:localeConfig} on
		* {@code <application>}.
		*
		* For more information, see TODO(b/214154050): add link to guide
		* <p>For more information, see
		* <a href="https://developer.android.com/about/versions/13/features/app-languages#use-localeconfig">
		* the section on per-app language preferences</a>.
		*
		* @attr ref android.R.styleable#LocaleConfig_Locale_name
		* @attr ref android.R.styleable#AndroidManifestApplication_localeConfig

core/java/android/content/pm/PackageParser.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -2618,6 +2618,15 @@ public class PackageParser {
		return Build.VERSION_CODES.CUR_DEVELOPMENT;
		}

		// STOPSHIP: hack for the pre-release SDK
		if (platformSdkCodenames.length == 0
		&& Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(
		targetCode)) {
		Slog.w(TAG, "Package requires development platform " + targetCode
		+ ", returning current version " + Build.VERSION.SDK_INT);
		return Build.VERSION.SDK_INT;
		}

		// Otherwise, we're looking at an incompatible pre-release SDK.
		if (platformSdkCodenames.length > 0) {
		outError[0] = "Requires development platform " + targetCode
		@@ -2689,6 +2698,15 @@ public class PackageParser {
		return Build.VERSION_CODES.CUR_DEVELOPMENT;
		}

		// STOPSHIP: hack for the pre-release SDK
		if (platformSdkCodenames.length == 0
		&& Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(
		minCode)) {
		Slog.w(TAG, "Package requires min development platform " + minCode
		+ ", returning current version " + Build.VERSION.SDK_INT);
		return Build.VERSION.SDK_INT;
		}

		// Otherwise, we're looking at an incompatible pre-release SDK.
		if (platformSdkCodenames.length > 0) {
		outError[0] = "Requires development platform " + minCode

core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java

+26 −4

Original line number	Diff line number	Diff line
		@@ -315,6 +315,15 @@ public class FrameworkParsingPackageUtils {
		return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);
		}

		// STOPSHIP: hack for the pre-release SDK
		if (platformSdkCodenames.length == 0
		&& Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(
		minCode)) {
		Slog.w(TAG, "Parsed package requires min development platform " + minCode
		+ ", returning current version " + Build.VERSION.SDK_INT);
		return input.success(Build.VERSION.SDK_INT);
		}

		// Otherwise, we're looking at an incompatible pre-release SDK.
		if (platformSdkCodenames.length > 0) {
		return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,
		@@ -367,16 +376,29 @@ public class FrameworkParsingPackageUtils {
		return input.success(targetVers);
		}

		if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {
		return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);
		}

		// If it's a pre-release SDK and the codename matches this platform, it
		// definitely targets this SDK.
		if (matchTargetCode(platformSdkCodenames, targetCode)) {
		return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);
		}

		// STOPSHIP: hack for the pre-release SDK
		if (platformSdkCodenames.length == 0
		&& Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(
		targetCode)) {
		Slog.w(TAG, "Parsed package requires development platform " + targetCode
		+ ", returning current version " + Build.VERSION.SDK_INT);
		return input.success(Build.VERSION.SDK_INT);
		}

		try {
		if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {
		return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);
		}
		} catch (IllegalArgumentException e) {
		return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK, "Bad package SDK");
		}

		// Otherwise, we're looking at an incompatible pre-release SDK.
		if (platformSdkCodenames.length > 0) {
		return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,

core/java/android/provider/Settings.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -9694,6 +9694,40 @@ public final class Settings {
		public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
		"active_unlock_on_biometric_fail";

		/**
		* If active unlock triggers on biometric failures, include the following error codes
		* as a biometric failure. See {@link android.hardware.biometrics.BiometricFaceConstants}.
		* Error codes should be separated by a pipe. For example: "1\|4\|5". If active unlock
		* should never trigger on any face errors, this should be set to an empty string.
		* A null value will use the system default value (TIMEOUT).
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_FACE_ERRORS =
		"active_unlock_on_face_errors";

		/**
		* If active unlock triggers on biometric failures, include the following acquired info
		* as a "biometric failure". See {@link android.hardware.biometrics.BiometricFaceConstants}.
		* Acquired codes should be separated by a pipe. For example: "1\|4\|5". If active unlock
		* should never on trigger on any acquired info messages, this should be
		* set to an empty string. A null value will use the system default value (none).
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_FACE_ACQUIRE_INFO =
		"active_unlock_on_face_acquire_info";

		/**
		* If active unlock triggers on biometric failures, then also request active unlock on
		* unlock intent when each setting (BiometricType) is the only biometric type enrolled.
		* Biometric types should be separated by a pipe. For example: "0\|3" or "0". If this
		* setting should be disabled, then this should be set to an empty string. A null value
		* will use the system default value (0 / None).
		* 0 = None, 1 = Any face, 2 = Any fingerprint, 3 = Under display fingerprint
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_WHEN_BIOMETRIC_ENROLLED =
		"active_unlock_on_unlock_intent_when_biometric_enrolled";

		/**
		* Whether the assist gesture should be enabled.
		*

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/AppPairsHelper.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ class AppPairsHelper(
		val displayBounds = WindowUtils.displayBounds
		val secondaryAppBounds = Region.from(0,
		dividerBounds.bounds.bottom - WindowUtils.dockedStackDividerInset,
		displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarHeight)
		displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarFrameHeight)
		return secondaryAppBounds
		}