Snap for 11712589 from e1a221873ef752f4cf95c0a244a48470f3c85bf2 to 24Q3-release (f0de27d0) · Commits · e / os / android_frameworks_base

core/java/android/service/notification/Adjustment.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.Nullable;
		import android.annotation.StringDef;
		import android.annotation.SystemApi;
		import android.app.Notification;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -146,8 +147,13 @@ public final class Adjustment implements Parcelable {

		/**
		* Data type: boolean, when true it suggests that the content text of this notification is
		* sensitive. A notification listener can use this information to redact notifications on locked
		* devices.
		* sensitive. The system uses this information to improve privacy around the notification
		* content. In {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, sensitive notification content is
		* redacted from updates to most {@link NotificationListenerService
		* NotificationListenerServices}. Also if an app posts a sensitive notification while
		* {@link android.media.projection.MediaProjection screen-sharing} is active, that app's windows
		* are blocked from screen-sharing and a {@link android.widget.Toast Toast} is shown to inform
		* the user about this.
		*/
		public static final String KEY_SENSITIVE_CONTENT = "key_sensitive_content";

core/java/android/view/Surface.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -103,9 +103,9 @@ public class Surface implements Parcelable {
		long nativeObject, float frameRate, int compatibility, int changeFrameRateStrategy);
		private static native void nativeDestroy(long nativeObject);

		// 5MB is a wild guess for what the average surface should be. On most new phones, a full-screen
		// surface is about 9MB... but not all surfaces are screen size. This should be a nice balance.
		private static final long SURFACE_NATIVE_ALLOCATION_SIZE_BYTES = 5_000_000;
		// 5KB is a balanced guess, since these are still pretty heavyweight objects, but if we make
		// this too big, it can overwhelm the GC.
		private static final long SURFACE_NATIVE_ALLOCATION_SIZE_BYTES = 5_000;

		public static final @android.annotation.NonNull Parcelable.Creator<Surface> CREATOR =
		new Parcelable.Creator<Surface>() {

core/java/android/view/ViewRootImpl.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static android.view.Display.INVALID_DISPLAY;
		import static android.view.DragEvent.ACTION_DRAG_LOCATION;
		import static android.view.InputDevice.SOURCE_CLASS_NONE;
		import static android.view.InsetsSource.ID_IME;
		import static android.view.Surface.FRAME_RATE_CATEGORY_DEFAULT;
		import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;
		import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH_HINT;
		import static android.view.Surface.FRAME_RATE_CATEGORY_LOW;
		@@ -1041,10 +1042,10 @@ public final class ViewRootImpl implements ViewParent,

		// The preferred frame rate category of the view that
		// could be updated on a frame-by-frame basis.
		private int mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;
		private int mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_DEFAULT;
		// The preferred frame rate category of the last frame that
		// could be used to lower frame rate after touch boost
		private int mLastPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;
		private int mLastPreferredFrameRateCategory = FRAME_RATE_CATEGORY_DEFAULT;
		// The preferred frame rate of the view that is mainly used for
		// touch boosting, view velocity handling, and TextureView.
		private float mPreferredFrameRate = 0;
		@@ -4198,10 +4199,11 @@ public final class ViewRootImpl implements ViewParent,
		? mFrameRateCategoryNormalCount - 1 : mFrameRateCategoryNormalCount;
		mFrameRateCategoryLowCount = mFrameRateCategoryLowCount > 0
		? mFrameRateCategoryLowCount - 1 : mFrameRateCategoryLowCount;
		mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;
		mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_DEFAULT;
		mPreferredFrameRate = -1;
		mFrameRateCompatibility = FRAME_RATE_COMPATIBILITY_FIXED_SOURCE;
		mIsFrameRateConflicted = false;
		mFrameRateCategoryChangeReason = FRAME_RATE_CATEGORY_REASON_UNKNOWN;
		}

		private void createSyncIfNeeded() {
		@@ -12474,7 +12476,7 @@ public final class ViewRootImpl implements ViewParent,
		&& sToolkitFrameRateVelocityMappingReadOnlyFlagValue)) {
		return;
		}
		int categoryFromConflictedFrameRates = FRAME_RATE_CATEGORY_NO_PREFERENCE;
		int categoryFromConflictedFrameRates = FRAME_RATE_CATEGORY_DEFAULT;
		if (mIsFrameRateConflicted) {
		categoryFromConflictedFrameRates = mPreferredFrameRate > 60
		? FRAME_RATE_CATEGORY_HIGH : FRAME_RATE_CATEGORY_NORMAL;
		@@ -12504,7 +12506,8 @@ public final class ViewRootImpl implements ViewParent,
		}

		try {
		if (mLastPreferredFrameRateCategory != frameRateCategory) {
		if (frameRateCategory != FRAME_RATE_CATEGORY_DEFAULT
		&& mLastPreferredFrameRateCategory != frameRateCategory) {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
		String reason = reasonToString(mFrameRateCategoryChangeReason);
		String sourceView = mFrameRateCategoryView == null ? "-"
		@@ -12644,6 +12647,9 @@ public final class ViewRootImpl implements ViewParent,
		}

		int oldCategory = mPreferredFrameRateCategory;
		// For View that votes NO_PREFERENCE
		mPreferredFrameRateCategory = frameRateCategory;

		if (mFrameRateCategoryHighCount > 0) {
		mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_HIGH;
		} else if (mFrameRateCategoryHighHintCount > 0) {

core/res/res/drawable/ic_private_profile_badge.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,10 @@
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z"
		android:pathData="M12,2L4,5V11.09C4,16.14 7.41,20.85 12,22C16.59,20.85 20,16.14 20,11.09V5L12,2ZM15,15V17H13V18H11V12.84C9.56,12.41 8.5,11.09 8.5,9.5C8.5,7.57 10.07,6 12,6C13.93,6 15.5,7.57 15.5,9.5C15.5,11.08 14.44,12.41 13,12.84V15H15Z"
		android:fillColor="#3C4043"
		android:fillType="evenOdd"/>
		<path
		android:pathData="M12,11C12.828,11 13.5,10.328 13.5,9.5C13.5,8.672 12.828,8 12,8C11.172,8 10.5,8.672 10.5,9.5C10.5,10.328 11.172,11 12,11Z"
		android:fillColor="#3C4043"/>
		</vector>
		No newline at end of file

core/res/res/drawable/ic_private_profile_icon_badge.xml

+7 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,11 @@
		android:translateX="42"
		android:translateY="42">
		<path
		android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z"
		android:pathData="M12,2L4,5V11.09C4,16.14 7.41,20.85 12,22C16.59,20.85 20,16.14 20,11.09V5L12,2ZM15,15V17H13V18H11V12.84C9.56,12.41 8.5,11.09 8.5,9.5C8.5,7.57 10.07,6 12,6C13.93,6 15.5,7.57 15.5,9.5C15.5,11.08 14.44,12.41 13,12.84V15H15Z"
		android:fillColor="#3C4043"
		android:fillType="evenOdd"/>
		<path
		android:pathData="M12,11C12.828,11 13.5,10.328 13.5,9.5C13.5,8.672 12.828,8 12,8C11.172,8 10.5,8.672 10.5,9.5C10.5,10.328 11.172,11 12,11Z"
		android:fillColor="#3C4043"/>
		</group>
		</vector>
		No newline at end of file