Snap for 8534619 from e46c50811b050cdb21b1d86465a9b7016f362379 to tm-release (c92a1cf4) · Commits · e / os / android_frameworks_base

apct-tests/perftests/utils/src/android/perftests/utils/ManualBenchmarkState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ public final class ManualBenchmarkState {

		private void fillStatus(Bundle status, String key, Stats stats) {
		if (shouldReport(StatsReport.FLAG_ITERATION)) {
		status.putLong(key + "_iteration (ns)", stats.getSize());
		status.putLong(key + "_iteration", stats.getSize());
		}
		if (shouldReport(StatsReport.FLAG_MEDIAN)) {
		status.putLong(key + "_median (ns)", stats.getMedian());

core/java/android/app/Activity.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -3925,15 +3925,32 @@ public class Activity extends ContextThemeWrapper
		* task will be moved to the back of the activity stack instead of being finished.
		* Other activities will simply be finished.
		*
		* <p>If you target version {@link android.os.Build.VERSION_CODES#S} or later and
		* override this method, it is strongly recommended to call through to the superclass
		* <li><p>If you target version {@link android.os.Build.VERSION_CODES#S} and
		* override this method, we strongly recommend to call through to the superclass
		* implementation after you finish handling navigation within the app.
		*
		* <li><p>If you target version {@link android.os.Build.VERSION_CODES#TIRAMISU} or later,
		* you should not use this method but register an {@link OnBackInvokedCallback} on an
		* {@link OnBackInvokedDispatcher} that you can retrieve using
		* {@link #getOnBackInvokedDispatcher()}. You should also set
		* {@code android:enableOnBackInvokedCallback="true"} in the application manifest.
		* <p>Alternatively, you can use
		* {@code androidx.activity.ComponentActivity#getOnBackPressedDispatcher()}
		* for backward compatibility.
		* </ul>
		*
		* @see #moveTaskToBack(boolean)
		*
		* @deprecated Use {@link OnBackInvokedCallback} or
		* {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
		* <p>
		* Starting from Android 13 (API level 33), back event handling is
		* moving to an ahead-of-time model and {@link Activity#onBackPressed()} and
		* {@link KeyEvent#KEYCODE_BACK} should not be used to handle back events (back gesture or
		* back button click). Instead, an {@link OnBackInvokedCallback} should be registered using
		* {@link Activity#getOnBackInvokedDispatcher()}
		* {@link OnBackInvokedDispatcher#registerOnBackInvokedCallback(int, OnBackInvokedCallback)
		* .registerOnBackInvokedCallback(priority, callback)}.
		*/
		@Deprecated
		public void onBackPressed() {

core/java/android/app/Dialog.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -720,8 +720,27 @@ public class Dialog implements DialogInterface, Window.Callback,
		* key. The default implementation simply cancels the dialog (only if
		* it is cancelable), but you can override this to do whatever you want.
		*
		* <p>
		* If you target version {@link android.os.Build.VERSION_CODES#TIRAMISU} or later, you
		* should not use this method but register an {@link OnBackInvokedCallback} on an
		* {@link OnBackInvokedDispatcher} that you can retrieve using
		* {@link #getOnBackInvokedDispatcher()}. You should also set
		* {@code android:enableOnBackInvokedCallback="true"} in the application manifest.
		*
		* <p>Alternatively, you
		* can use {@code androidx.activity.ComponentDialog#getOnBackPressedDispatcher()}
		* for backward compatibility.
		*
		* @deprecated Use {@link OnBackInvokedCallback} or
		* {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
		* <p>
		* Starting from Android 13 (API level 33), back event handling is
		* moving to an ahead-of-time model and {@link #onBackPressed()} and
		* {@link KeyEvent#KEYCODE_BACK} should not be used to handle back events (back gesture or
		* back button click). Instead, an {@link OnBackInvokedCallback} should be registered using
		* {@link Dialog#getOnBackInvokedDispatcher()}
		* {@link OnBackInvokedDispatcher#registerOnBackInvokedCallback(int, OnBackInvokedCallback)
		* .registerOnBackInvokedCallback(priority, callback)}.
		*/
		@Deprecated
		public void onBackPressed() {

core/java/android/hardware/display/DisplayManager.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -1436,13 +1436,5 @@ public final class DisplayManager {
		* @hide
		*/
		String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist";

		/**
		* Whether to allow the creation of always unlocked virtual displays by apps having the
		* required permissions.
		* @hide
		*/
		String KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS =
		"allow_always_unlocked_virtual_displays";
		}
		}

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -15040,6 +15040,14 @@ public final class Settings {
		*/
		public static final String DEVICE_CONFIG_SYNC_DISABLED = "device_config_sync_disabled";


		/**
		* Whether back preview animations are played when user does a back gesture or presses
		* the back button.
		* @hide
		*/
		public static final String ENABLE_BACK_ANIMATION = "enable_back_animation";

		/** @hide */ public static String zenModeToString(int mode) {
		if (mode == ZEN_MODE_IMPORTANT_INTERRUPTIONS) return "ZEN_MODE_IMPORTANT_INTERRUPTIONS";
		if (mode == ZEN_MODE_ALARMS) return "ZEN_MODE_ALARMS";