Snap for 6773961 from 3743d5526ac7a43d486a109b521dafa7a8a87874 to rvc-qpr1-release (04bae135) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -8928,6 +8928,14 @@ public final class Settings {
		*/
		public static final String MEDIA_CONTROLS_RESUME = "qs_media_resumption";

		/**
		* Controls which packages are blocked from persisting in media controls when resumption is
		* enabled. The list of packages is set by the user in the Settings app.
		* @see Settings.Secure#MEDIA_CONTROLS_RESUME
		* @hide
		*/
		public static final String MEDIA_CONTROLS_RESUME_BLOCKED = "qs_media_resumption_blocked";

		/**
		* Controls if window magnification is enabled.
		* @hide

core/java/android/service/autofill/InlinePresentation.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,11 @@ public final class InlinePresentation implements Parcelable {

		/**
		* Represents the UI content and the action for the inline suggestion.
		*
		* <p>The Slice should be constructed using the Content builder provided in the androidx
		* autofill library e.g. {@code androidx.autofill.inline.v1.InlineSuggestionUi.Content.Builder}
		* and then converted to a Slice with
		* {@code androidx.autofill.inline.UiVersions.Content#getSlice()}.</p>
		*/
		private final @NonNull Slice mSlice;

		@@ -90,6 +95,11 @@ public final class InlinePresentation implements Parcelable {
		*
		* @param slice
		* Represents the UI content and the action for the inline suggestion.
		*
		* <p>The Slice should be constructed using the Content builder provided in the androidx
		* autofill library e.g. {@code androidx.autofill.inline.v1.InlineSuggestionUi.Content.Builder}
		* and then converted to a Slice with
		* {@code androidx.autofill.inline.UiVersions.Content#getSlice()}.</p>
		* @param inlinePresentationSpec
		* Specifies the UI specification for the inline suggestion.
		* @param pinned
		@@ -118,6 +128,11 @@ public final class InlinePresentation implements Parcelable {

		/**
		* Represents the UI content and the action for the inline suggestion.
		*
		* <p>The Slice should be constructed using the Content builder provided in the androidx
		* autofill library e.g. {@code androidx.autofill.inline.v1.InlineSuggestionUi.Content.Builder}
		* and then converted to a Slice with
		* {@code androidx.autofill.inline.UiVersions.Content#getSlice()}.</p>
		*/
		@DataClass.Generated.Member
		public @NonNull Slice getSlice() {
		@@ -244,7 +259,7 @@ public final class InlinePresentation implements Parcelable {
		};

		@DataClass.Generated(
		time = 1593131904745L,
		time = 1596484869201L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/service/autofill/InlinePresentation.java",
		inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)")

core/java/android/widget/inline/InlinePresentationSpec.java

+22 −7

Original line number	Diff line number	Diff line
		@@ -42,8 +42,13 @@ public final class InlinePresentationSpec implements Parcelable {
		private final Size mMaxSize;

		/**
		* The extras encoding the UI style information. Defaults to {@code Bundle.Empty} in which case
		* the default system UI style will be used.
		* The extras encoding the UI style information.
		*
		* <p>The style bundles can be created using the relevant Style classes and their builders in
		* the androidx autofill library e.g. {@code androidx.autofill.inline.UiVersions.StylesBuilder}.
		* </p>
		*
		* <p>The style must be set for the suggestion to render properly.</p>
		*
		* <p>Note: There should be no remote objects in the bundle, all included remote objects will
		* be removed from the bundle before transmission.</p>
		@@ -123,8 +128,13 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		/**
		* The extras encoding the UI style information. Defaults to {@code Bundle.Empty} in which case
		* the default system UI style will be used.
		* The extras encoding the UI style information.
		*
		* <p>The style bundles can be created using the relevant Style classes and their builders in
		* the androidx autofill library e.g. {@code androidx.autofill.inline.UiVersions.StylesBuilder}.
		* </p>
		*
		* <p>The style must be set for the suggestion to render properly.</p>
		*
		* <p>Note: There should be no remote objects in the bundle, all included remote objects will
		* be removed from the bundle before transmission.</p>
		@@ -264,8 +274,13 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		/**
		* The extras encoding the UI style information. Defaults to {@code Bundle.Empty} in which case
		* the default system UI style will be used.
		* The extras encoding the UI style information.
		*
		* <p>The style bundles can be created using the relevant Style classes and their builders in
		* the androidx autofill library e.g. {@code androidx.autofill.inline.UiVersions.StylesBuilder}.
		* </p>
		*
		* <p>The style must be set for the suggestion to render properly.</p>
		*
		* <p>Note: There should be no remote objects in the bundle, all included remote objects will
		* be removed from the bundle before transmission.</p>
		@@ -302,7 +317,7 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		@DataClass.Generated(
		time = 1588109681295L,
		time = 1596485189661L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/widget/inline/InlinePresentationSpec.java",
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nprivate final @android.annotation.NonNull android.os.Bundle mStyle\nprivate static @android.annotation.NonNull android.os.Bundle defaultStyle()\nprivate boolean styleEquals(android.os.Bundle)\npublic void filterContentTypes()\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")

libs/hwui/JankTracker.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,9 @@ void JankTracker::finishFrame(const FrameInfo& frame) {
		(*mGlobalData)->reportJank();
		}

		if (mSwapDeadline < 0) {
		mSwapDeadline = frame[FrameInfoIndex::IntendedVsync] + mFrameInterval;
		}
		bool isTripleBuffered = (mSwapDeadline - frame[FrameInfoIndex::IntendedVsync]) > (mFrameInterval * 0.1);

		mSwapDeadline = std::max(mSwapDeadline + mFrameInterval,

libs/hwui/JankTracker.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ private:

		std::array<int64_t, NUM_BUCKETS> mThresholds;
		int64_t mFrameInterval;
		nsecs_t mSwapDeadline;
		nsecs_t mSwapDeadline = -1;
		// The amount of time we will erase from the total duration to account
		// for SF vsync offsets with HWC2 blocking dequeueBuffers.
		// (Vsync + mDequeueBlockTolerance) is the point at which we expect