Snap for 6374617 from fe295735335c6e51af11d092392785b9c20b672f to mainline-release (2c710601) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.util.MergedConfiguration;
		import android.view.DisplayCutout;
		import android.view.IWindow;
		import android.view.IWindowSession;
		import android.view.InsetsSourceControl;
		import android.view.InsetsState;
		import android.view.SurfaceControl;
		import android.view.View;
		@@ -120,6 +121,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase {
		new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);
		final MergedConfiguration mOutMergedConfiguration = new MergedConfiguration();
		final InsetsState mOutInsetsState = new InsetsState();
		final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];
		final IWindow mWindow;
		final View mView;
		final WindowManager.LayoutParams mParams;
		@@ -152,7 +154,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase {
		mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrame,
		mOutContentInsets, mOutVisibleInsets, mOutStableInsets,
		mOutBackDropFrame, mOutDisplayCutout, mOutMergedConfiguration,
		mOutSurfaceControl, mOutInsetsState, mOutSurfaceSize,
		mOutSurfaceControl, mOutInsetsState, mOutControls, mOutSurfaceSize,
		mOutBlastSurfaceControl);
		}
		}

apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.view.Display;
		import android.view.DisplayCutout;
		import android.view.IWindowSession;
		import android.view.InputChannel;
		import android.view.InsetsSourceControl;
		import android.view.InsetsState;
		import android.view.View;
		import android.view.WindowManager;
		@@ -91,6 +92,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase
		final DisplayCutout.ParcelableWrapper mOutDisplayCutout =
		new DisplayCutout.ParcelableWrapper();
		final InsetsState mOutInsetsState = new InsetsState();
		final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];

		TestWindow() {
		mLayoutParams.setTitle(TestWindow.class.getName());
		@@ -109,7 +111,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase
		long startTime = SystemClock.elapsedRealtimeNanos();
		session.addToDisplay(this, mSeq, mLayoutParams, View.VISIBLE,
		Display.DEFAULT_DISPLAY, mOutFrame, mOutContentInsets, mOutStableInsets,
		mOutDisplayCutout, inputChannel, mOutInsetsState);
		mOutDisplayCutout, inputChannel, mOutInsetsState, mOutControls);
		final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime;
		state.addExtraResult("add", elapsedTimeNsOfAdd);

api/test-current.txt

+12 −1

Original line number	Diff line number	Diff line
		@@ -4714,7 +4714,6 @@ package android.util {
		field public static final String FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";
		field public static final String FFLAG_PREFIX = "sys.fflag.";
		field public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
		field public static final String NOTIF_CONVO_BYPASS_SHORTCUT_REQ = "settings_notif_convo_bypass_shortcut_req";
		field public static final String PERSIST_PREFIX = "persist.sys.fflag.override.";
		field public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";
		field public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";
		@@ -4815,7 +4814,14 @@ package android.view {

		public final class Display {
		method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut();
		method public int getType();
		method public boolean hasAccess(int);
		field public static final int TYPE_EXTERNAL = 2; // 0x2
		field public static final int TYPE_INTERNAL = 1; // 0x1
		field public static final int TYPE_OVERLAY = 4; // 0x4
		field public static final int TYPE_UNKNOWN = 0; // 0x0
		field public static final int TYPE_VIRTUAL = 5; // 0x5
		field public static final int TYPE_WIFI = 3; // 0x3
		}

		public class FocusFinder {
		@@ -4853,6 +4859,11 @@ package android.view {
		method public abstract String asyncImpl() default "";
		}

		public final class SurfaceControl implements android.os.Parcelable {
		method public static long acquireFrameRateFlexibilityToken();
		method public static void releaseFrameRateFlexibilityToken(long);
		}

		public class SurfaceControlViewHost {
		method public void relayout(android.view.WindowManager.LayoutParams);
		method public void setView(@NonNull android.view.View, @NonNull android.view.WindowManager.LayoutParams);

cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ public class TestDrive {
		};
		private static final String[] DEFAULT_PULL_SOURCES = {
		"AID_SYSTEM",
		"AID_RADIO"
		};
		private static final Logger LOGGER = Logger.getLogger(TestDrive.class.getName());

core/java/android/annotation/NonNull.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ import java.lang.annotation.Target;
		* <p>
		* This is a marker annotation and it has no specific attributes.
		*
		* @paramDoc This value must never be {@code null}.
		* @returnDoc This value will never be {@code null}.
		* @paramDoc This value cannot be {@code null}.
		* @returnDoc This value cannot be {@code null}.
		* @hide
		*/
		@Retention(SOURCE)