Snap for 14104676 from 98b566b23f3e6de8db5adedc878f7af787443289 to 25Q4-release (fc503984) · Commits · e / os / android_frameworks_base

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		tests/
		tools/
		bpfmt = -d
		ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/desktopmode,apct-tests,tests/Input,tests/StructuredConcurrencyPerfTests,services/tests/servicestests/src/com/android/server/supervision,libs/WindowManager/Shell/src/com/android/wm/shell/compatui
		ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/desktopmode,apct-tests,tests/Input,tests/StructuredConcurrencyPerfTests,services/tests/servicestests/src/com/android/server/supervision,libs/WindowManager/Shell/src/com/android/wm/shell/compatui,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui
		google_java_format = --include-dirs=services/core/java/com/android/server/adb,tests/AppJankTest

		[Hook Scripts]

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ package android {
		field @Deprecated public static final String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
		field public static final String BIND_COMPANION_DEVICE_SERVICE = "android.permission.BIND_COMPANION_DEVICE_SERVICE";
		field public static final String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE";
		field @FlaggedApi("android.permission.flags.content_restriction_role_enabled") public static final String BIND_CONTENT_RESTRICTION_SERVICE = "android.permission.BIND_CONTENT_RESTRICTION_SERVICE";
		field public static final String BIND_CONTROLS = "android.permission.BIND_CONTROLS";
		field public static final String BIND_CREDENTIAL_PROVIDER_SERVICE = "android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE";
		field public static final String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";

core/java/android/app/Notification.java

+18 −4

Original line number	Diff line number	Diff line
		@@ -6175,6 +6175,9 @@ public class Notification implements Parcelable
		// Small icon doesn't need to be reset, as it's always set. Resetting would prevent
		// re-using the drawable when the notification is updated.
		contentView.setBoolean(R.id.expand_button, "setExpanded", false);
		if (Flags.apiMetricStyle()) {
		contentView.setViewVisibility(R.id.app_name_text_divider, View.GONE);
		}
		contentView.setViewVisibility(R.id.app_name_text, View.GONE);
		contentView.setTextViewText(R.id.app_name_text, null);
		contentView.setViewVisibility(R.id.chronometer, View.GONE);
		@@ -6568,13 +6571,16 @@ public class Notification implements Parcelable

		private void bindNotificationHeader(RemoteViews contentView, StandardTemplateParams p) {
		bindSmallIcon(contentView, p);

		boolean hasTextToLeft = Flags.apiMetricStyle()
		&& p.mTitleViewId == R.id.alt_title && p.hasTitle();
		// Populate text left-to-right so that separators are only shown between strings
		boolean hasTextToLeft = bindHeaderAppName(contentView, p, false /* force */);
		hasTextToLeft \|= bindHeaderAppName(contentView, p, false /* force */, hasTextToLeft);
		hasTextToLeft \|= bindHeaderTextSecondary(contentView, p, hasTextToLeft);
		hasTextToLeft \|= bindHeaderText(contentView, p, hasTextToLeft);
		if (!hasTextToLeft) {
		// If there's still no text, force add the app name so there is some text.
		hasTextToLeft \|= bindHeaderAppName(contentView, p, true /* force */);
		hasTextToLeft \|= bindHeaderAppName(contentView, p, true /* force */, hasTextToLeft);
		}
		bindHeaderChronometerAndTime(contentView, p, hasTextToLeft);
		bindPhishingAlertIcon(contentView, p);
		@@ -6708,7 +6714,7 @@ public class Notification implements Parcelable
		* @return {@code true} if the app name will be visible
		*/
		private boolean bindHeaderAppName(RemoteViews contentView, StandardTemplateParams p,
		boolean force) {
		boolean force, boolean hasTextToLeft) {
		if (p.mViewType == StandardTemplateParams.VIEW_TYPE_MINIMIZED && !force) {
		// unless the force flag is set, don't show the app name in the minimized state.
		return false;
		@@ -6726,6 +6732,9 @@ public class Notification implements Parcelable
		contentView.setViewVisibility(R.id.app_name_text, View.VISIBLE);
		contentView.setTextViewText(R.id.app_name_text, loadHeaderAppName());
		contentView.setTextColor(R.id.app_name_text, getSecondaryTextColor(p));
		if (Flags.apiMetricStyle() && hasTextToLeft) {
		contentView.setViewVisibility(R.id.app_name_text_divider, View.VISIBLE);
		}
		return true;
		}

		@@ -11802,6 +11811,7 @@ public class Notification implements Parcelable
		final StandardTemplateParams p = mBuilder.mParams.reset()
		.viewType(StandardTemplateParams.VIEW_TYPE_NORMAL)
		.fillTextsFrom(mBuilder).text(null)
		.hideProgress(true)
		.hideRightIcon(true);
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(
		@@ -11815,6 +11825,7 @@ public class Notification implements Parcelable
		final StandardTemplateParams p = mBuilder.mParams.reset()
		.viewType(StandardTemplateParams.VIEW_TYPE_HEADS_UP)
		.fillTextsFrom(mBuilder).text(null)
		.hideProgress(true)
		.hideRightIcon(true);
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(
		@@ -11827,7 +11838,10 @@ public class Notification implements Parcelable
		public RemoteViews makeExpandedContentView() {
		final StandardTemplateParams p = mBuilder.mParams.reset()
		.viewType(StandardTemplateParams.VIEW_TYPE_EXPANDED)
		.fillTextsFrom(mBuilder).text(null)
		.hideProgress(true)
		.fillTextsFrom(mBuilder)
		.text(null)
		.titleViewId(R.id.alt_title)
		.hideRightIcon(true);
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(

core/java/android/companion/virtual/computercontrol/ComputerControlSession.java

+29 −9

Original line number	Diff line number	Diff line
		@@ -64,6 +64,10 @@ public final class ComputerControlSession implements AutoCloseable {
		public static final String ACTION_REQUEST_ACCESS =
		"android.companion.virtual.computercontrol.action.REQUEST_ACCESS";

		/** @hide */
		public static final String EXTRA_AUTOMATING_PACKAGE_NAME =
		"android.companion.virtual.computercontrol.extra.AUTOMATING_PACKAGE_NAME";

		/**
		* Error code indicating that a new session cannot be created because the maximum number of
		* allowed concurrent sessions has been reached.
		@@ -118,15 +122,6 @@ public final class ComputerControlSession implements AutoCloseable {
		@Nullable
		private ImageReader mImageReader;

		/** Perform provided action on the trusted virtual display. */
		public void performAction(@Action int actionCode) {
		try {
		mSession.performAction(actionCode);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/** @hide */
		public ComputerControlSession(int displayId, @NonNull IVirtualDisplayCallback displayToken,
		@NonNull IComputerControlSession session) {
		@@ -170,6 +165,22 @@ public final class ComputerControlSession implements AutoCloseable {
		}
		}

		/**
		* Hand over full control of the automation session to the user.
		*
		* <p>All of the applications currently automated in the session are moved from the session's
		* display to the user's default display. No further automation is possible on these tasks,
		* although the session remains active and new applications may be launched via
		* {@link #launchApplication(String)}</p>
		*/
		public void handOverApplications() {
		try {
		mSession.handOverApplications();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Screenshot the current display content.
		*
		@@ -287,6 +298,15 @@ public final class ComputerControlSession implements AutoCloseable {
		}
		}

		/** Perform provided action on the trusted virtual display. */
		public void performAction(@Action int actionCode) {
		try {
		mSession.performAction(actionCode);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/** Injects a touch event into the trusted virtual display. */
		public void sendTouchEvent(@NonNull VirtualTouchEvent event) {
		try {

core/java/android/companion/virtual/computercontrol/IComputerControlSession.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@ interface IComputerControlSession {
		/** Launches an application on the trusted virtual display. */
		void launchApplication(in String packageName);

		/** Hand over full control of the automation session to the user. */
		void handOverApplications();

		/* Injects a tap event into the trusted virtual display. */
		void tap(int x, int y);