Snap for 13431276 from c789450dcc3d9419b0422d27926f5c25856948d0 to 25Q3-release (bf0e1e92) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -6599,7 +6599,7 @@ package android.app {
		field public static final String EXTRA_PROGRESS_MAX = "android.progressMax";
		field public static final String EXTRA_REMOTE_INPUT_DRAFT = "android.remoteInputDraft";
		field public static final String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";
		field @FlaggedApi("android.app.opt_in_rich_ongoing") public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.REQUEST_PROMOTED_ONGOING";
		field @FlaggedApi("android.app.opt_in_rich_ongoing") public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing";
		field @Deprecated public static final String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";
		field public static final String EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED = "android.showBigPictureWhenCollapsed";
		field public static final String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
		@@ -6982,16 +6982,16 @@ package android.app {
		ctor public Notification.ProgressStyle();
		method @NonNull public android.app.Notification.ProgressStyle addProgressPoint(@NonNull android.app.Notification.ProgressStyle.Point);
		method @NonNull public android.app.Notification.ProgressStyle addProgressSegment(@NonNull android.app.Notification.ProgressStyle.Segment);
		method public int getProgress();
		method @IntRange(from=0) public int getProgress();
		method @Nullable public android.graphics.drawable.Icon getProgressEndIcon();
		method public int getProgressMax();
		method @IntRange(from=0) public int getProgressMax();
		method @NonNull public java.util.List<android.app.Notification.ProgressStyle.Point> getProgressPoints();
		method @NonNull public java.util.List<android.app.Notification.ProgressStyle.Segment> getProgressSegments();
		method @Nullable public android.graphics.drawable.Icon getProgressStartIcon();
		method @Nullable public android.graphics.drawable.Icon getProgressTrackerIcon();
		method public boolean isProgressIndeterminate();
		method public boolean isStyledByProgress();
		method @NonNull public android.app.Notification.ProgressStyle setProgress(int);
		method @NonNull public android.app.Notification.ProgressStyle setProgress(@IntRange(from=0) int);
		method @NonNull public android.app.Notification.ProgressStyle setProgressEndIcon(@Nullable android.graphics.drawable.Icon);
		method @NonNull public android.app.Notification.ProgressStyle setProgressIndeterminate(boolean);
		method @NonNull public android.app.Notification.ProgressStyle setProgressPoints(@NonNull java.util.List<android.app.Notification.ProgressStyle.Point>);
		@@ -7005,7 +7005,7 @@ package android.app {
		ctor public Notification.ProgressStyle.Point(@IntRange(from=1) int);
		method @ColorInt public int getColor();
		method public int getId();
		method public int getPosition();
		method @IntRange(from=1) public int getPosition();
		method @NonNull public android.app.Notification.ProgressStyle.Point setColor(@ColorInt int);
		method @NonNull public android.app.Notification.ProgressStyle.Point setId(int);
		}
		@@ -7014,7 +7014,7 @@ package android.app {
		ctor public Notification.ProgressStyle.Segment(@IntRange(from=1) int);
		method @ColorInt public int getColor();
		method public int getId();
		method public int getLength();
		method @IntRange(from=1) public int getLength();
		method @NonNull public android.app.Notification.ProgressStyle.Segment setColor(@ColorInt int);
		method @NonNull public android.app.Notification.ProgressStyle.Segment setId(int);
		}

core/java/android/app/Activity.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ import android.view.accessibility.AccessibilityEvent;
		import android.view.autofill.AutofillClientController;
		import android.view.autofill.AutofillId;
		import android.view.autofill.AutofillManager.AutofillClient;
		import android.view.autofill.AutofillValue;
		import android.view.contentcapture.ContentCaptureContext;
		import android.view.contentcapture.ContentCaptureManager;
		import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;
		@@ -10197,4 +10198,19 @@ public class Activity extends ContextThemeWrapper
		mJankTracker.disableAppJankTracking();
		}
		}

		final void autofillViewIfAvailable(
		@NonNull AutofillId targetAutofillId, @NonNull AutofillValue autofillValue) {
		if (false) Log.v(TAG, "autofill view in client app Activity, id: " + targetAutofillId);
		runOnUiThread(
		() -> {
		View view =
		getAutofillClientController()
		.autofillClientFindViewByAutofillIdTraversal(targetAutofillId);
		if (view != null) {
		// TODO: b/410146465 support virtual views
		view.autofill(autofillValue);
		}
		});
		}
		}

core/java/android/app/ActivityThread.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,8 @@ import android.view.Window;
		import android.view.WindowManager;
		import android.view.WindowManagerGlobal;
		import android.view.autofill.AutofillId;
		import android.view.autofill.AutofillManager;
		import android.view.autofill.AutofillValue;
		import android.view.contentcapture.IContentCaptureManager;
		import android.view.contentcapture.IContentCaptureOptionsCallback;
		import android.view.translation.TranslationSpec;
		@@ -4723,6 +4725,19 @@ public final class ActivityThread extends ClientTransactionHandler
		resultCallback.sendResult(null);
		return;
		}

		if (actionId.equals(AutofillManager.DIRECT_ACTION_ID_REMOTE_AUTOFILL)) {
		AutofillId autofillId =
		arguments.getParcelable(
		AutofillManager.EXTRA_REMOTE_AUTOFILL_ID, AutofillId.class);
		AutofillValue autofillValue =
		arguments.getParcelable(
		AutofillManager.EXTRA_REMOTE_AUTOFILL_VALUE, AutofillValue.class);
		if (autofillId != null && autofillValue != null) {
		r.activity.autofillViewIfAvailable(autofillId, autofillValue);
		}
		}

		final Bundle nonNullArguments = (arguments != null) ? arguments : Bundle.EMPTY;
		r.activity.onPerformDirectAction(actionId, nonNullArguments, cancellationSignal,
		resultCallback::sendResult);

core/java/android/app/INotificationManager.aidl

+8 −7

Original line number	Diff line number	Diff line
		@@ -84,8 +84,9 @@ interface INotificationManager
		boolean isImportanceLocked(String pkg, int uid);

		List<String> getAllowedAssistantAdjustments(String pkg);
		void allowAssistantAdjustment(String adjustmentType);
		void disallowAssistantAdjustment(String adjustmentType);
		List<String> getAllowedAssistantAdjustmentsForUser(int userId);
		void allowAssistantAdjustment(int userId, String adjustmentType);
		void disallowAssistantAdjustment(int userId, String adjustmentType);

		boolean shouldHideSilentStatusIcons(String callingPkg);
		void setHideSilentStatusIcons(boolean hide);
		@@ -268,11 +269,11 @@ interface INotificationManager
		void setAdjustmentTypeSupportedState(in INotificationListener token, String key, boolean supported);
		List<String> getUnsupportedAdjustmentTypes();

		int[] getAllowedAdjustmentKeyTypes();
		void setAssistantAdjustmentKeyTypeState(int type, boolean enabled);
		String[] getAdjustmentDeniedPackages(String key);
		boolean isAdjustmentSupportedForPackage(String key, String pkg);
		void setAdjustmentSupportedForPackage(String key, String pkg, boolean enabled);
		int[] getAllowedClassificationTypes();
		void setAssistantClassificationTypeState(int type, boolean enabled);
		String[] getAdjustmentDeniedPackages(int userId, String key);
		boolean isAdjustmentSupportedForPackage(int userId, String key, String pkg);
		void setAdjustmentSupportedForPackage(int userId, String key, String pkg, boolean enabled);

		// TODO: b/389918945 - Remove once nm_binder_perf flags are going to Nextfood.
		void incrementCounter(String metricId);

core/java/android/app/Notification.java

+23 −23

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.app;

		import static android.annotation.Dimension.DP;
		import static android.app.Flags.FLAG_NM_SUMMARIZATION;
		import static android.app.Flags.evenlyDividedCallStyleActionLayout;
		import static android.app.Flags.notificationsRedesignTemplates;
		import static android.app.admin.DevicePolicyResources.Drawables.Source.NOTIFICATION;
		import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_COLORED;
		@@ -235,13 +234,6 @@ public class Notification implements Parcelable
		*/
		public static final String EXTRA_NOTIFICATION_ID = "android.intent.extra.NOTIFICATION_ID";

		/**
		* Optional extra for {@link Notification}. If provided, should contain a boolean indicating
		* whether the notification is requesting promoted treatment.
		*/
		@FlaggedApi(Flags.FLAG_OPT_IN_RICH_ONGOING)
		public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.REQUEST_PROMOTED_ONGOING";

		/**
		* Use all default values (where applicable).
		*/
		@@ -1736,6 +1728,13 @@ public class Notification implements Parcelable
		@FlaggedApi(Flags.FLAG_API_RICH_ONGOING)
		public static final String EXTRA_PROGRESS_END_ICON = "android.progressEndIcon";

		/**
		* {@link #extras} key: If provided, should contain a boolean indicating
		* whether the notification is requesting promoted treatment.
		*/
		@FlaggedApi(Flags.FLAG_OPT_IN_RICH_ONGOING)
		public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing";

		/**
		* @hide
		*/
		@@ -1797,6 +1796,7 @@ public class Notification implements Parcelable
		*/
		public static final String EXTRA_SUMMARIZED_CONTENT = "android.summarization";


		@UnsupportedAppUsage
		private Icon mSmallIcon;
		@UnsupportedAppUsage
		@@ -6673,13 +6673,11 @@ public class Notification implements Parcelable
		contentView.setInt(R.id.actions, "setCollapsibleIndentDimen",
		R.dimen.call_notification_collapsible_indent);
		}
		if (evenlyDividedCallStyleActionLayout()) {
		if (CallStyle.DEBUG_NEW_ACTION_LAYOUT) {
		Log.d(TAG, "setting evenly divided mode on action list");
		}
		contentView.setBoolean(R.id.actions, "setEvenlyDividedMode", true);
		}
		}
		if (!notificationsRedesignTemplates()) {
		contentView.setBoolean(R.id.actions, "setEmphasizedMode", emphasizedMode);
		}
		@@ -7281,7 +7279,7 @@ public class Notification implements Parcelable


		final CharSequence label = ensureColorSpanContrastOrStripStyling(title, p);
		if (p.mCallStyleActions && evenlyDividedCallStyleActionLayout()) {
		if (p.mCallStyleActions) {
		if (CallStyle.DEBUG_NEW_ACTION_LAYOUT) {
		Log.d(TAG, "new action layout enabled, gluing instead of setting text");
		}
		@@ -7305,14 +7303,10 @@ public class Notification implements Parcelable
		button.setColorStateList(R.id.action0, "setButtonBackground",
		ColorStateList.valueOf(buttonFillColor));
		if (p.mCallStyleActions) {
		if (evenlyDividedCallStyleActionLayout()) {
		if (CallStyle.DEBUG_NEW_ACTION_LAYOUT) {
		Log.d(TAG, "new action layout enabled, gluing instead of setting icon");
		}
		button.setIcon(R.id.action0, "glueIcon", action.getIcon());
		} else {
		button.setImageViewIcon(R.id.action0, action.getIcon());
		}
		boolean priority = action.getExtras().getBoolean(CallStyle.KEY_ACTION_PRIORITY);
		button.setBoolean(R.id.action0, "setIsPriority", priority);
		int minWidthDimen =
		@@ -11680,6 +11674,7 @@ public class Notification implements Parcelable
		* Gets the progress value of the progress bar.
		* @see #setProgress
		*/
		@IntRange(from = 0)
		public int getProgress() {
		return mProgress;
		}
		@@ -11691,7 +11686,7 @@ public class Notification implements Parcelable
		* The max progress value is the sum of all Segment lengths.
		* The default value is 0.
		*/
		public @NonNull ProgressStyle setProgress(int progress) {
		public @NonNull ProgressStyle setProgress(@IntRange(from = 0) int progress) {
		mProgress = progress;
		return this;
		}
		@@ -11700,6 +11695,7 @@ public class Notification implements Parcelable
		* Gets the sum of the lengths of all Segments in the style, which
		* defines the maximum progress. Defaults to 100 when segments are omitted.
		*/
		@IntRange(from = 0)
		public int getProgressMax() {
		final List<Segment> progressSegment = mProgressSegments;
		if (progressSegment == null \|\| progressSegment.isEmpty()) {
		@@ -12280,6 +12276,7 @@ public class Notification implements Parcelable
		* This value has no units, it is just relative to the length of other segments,
		* and the value provided to {@link ProgressStyle#setProgress}.
		*/
		@IntRange(from = 1)
		public int getLength() {
		return mLength;
		}
		@@ -12295,6 +12292,7 @@ public class Notification implements Parcelable

		/**
		* Optional ID used to uniquely identify the element across updates.
		* The default is 0.
		*/
		public @NonNull Segment setId(int id) {
		mId = id;
		@@ -12346,7 +12344,7 @@ public class Notification implements Parcelable
		public static final class Point {

		private int mPosition;
		private int mId;
		private int mId = 0;
		@ColorInt
		private int mColor = Notification.COLOR_DEFAULT;

		@@ -12366,6 +12364,7 @@ public class Notification implements Parcelable
		* The position of this point on the progress bar
		* relative to {@link ProgressStyle#getProgressMax}.
		*/
		@IntRange(from = 1)
		public int getPosition() {
		return mPosition;
		}
		@@ -12380,6 +12379,7 @@ public class Notification implements Parcelable

		/**
		* Optional ID used to uniquely identify the element across updates.
		* The default is 0.
		*/
		public @NonNull Point setId(int id) {
		mId = id;