Snap for 14021439 from bdd2d660f1d749ad3c2fd1c15c6ee915ccb24fcb to 25Q4-release (14598f5d) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,7 @@ import java.util.TimeZone;
		import java.util.concurrent.Executor;
		import java.util.concurrent.atomic.AtomicInteger;
		import java.util.function.Consumer;
		import java.util.stream.Collectors;

		/**
		* This manages the execution of the main thread in an
		@@ -1168,6 +1169,39 @@ public final class ActivityThread extends ClientTransactionHandler
		ApplicationThread() {
		}

		@Override
		public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
		throws RemoteException {
		if (Build.IS_DEBUGGABLE) {
		int callingUid = Binder.getCallingUid();
		if (callingUid != Process.SYSTEM_UID) {
		String packageName;
		if (callingUid == Process.ROOT_UID) {
		packageName = "root";
		} else {
		String[] packagesForUid =
		getSystemContext().getPackageManager().getPackagesForUid(
		callingUid);
		if (packagesForUid == null \|\| packagesForUid.length == 0) {
		packageName = "unknown";
		} else if (packagesForUid.length == 1) {
		packageName = packagesForUid[0];
		} else {
		packageName = Arrays.asList(packagesForUid).stream().sorted().collect(
		Collectors.joining(", "));
		}
		}
		Slog.wtf(TAG, "ApplicationThread called by non-system process"
		+ " (callingUid: " + callingUid
		+ "; packageName: " + packageName
		+ "; code: " + code
		+ "; flags: " + flags
		+ ")");
		}
		}
		return super.onTransact(code, data, reply, flags);
		}

		private static final String DB_CONNECTION_INFO_HEADER = " %8s %8s %14s %5s %5s %5s %s";
		private static final String DB_CONNECTION_INFO_FORMAT = " %8s %8s %14s %5d %5d %5d %s";
		private static final String DB_POOL_INFO_HEADER = " %13s %13s %13s %s";

core/java/android/app/Notification.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -16811,7 +16811,7 @@ public class Notification implements Parcelable
		}
		}
		// make sure every color has a valid value
		mProtectionColor = ctx.getColor(R.color.surface_effect_3);
		mProtectionColor = ColorUtils.blendARGB(mPrimaryTextColor, mBackgroundColor, 0.9f);
		mSemanticRedContainerHighColor =
		ctx.getColor(R.color.materialColorSemanticRedContainerHigh);
		}

core/java/android/appwidget/AppWidgetHostView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -436,8 +436,8 @@ public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppW
		maxHeight = Math.max(maxHeight, paddedSize.getHeight());
		}
		if (paddedSizes.equals(
		widgetManager.getAppWidgetOptions(mAppWidgetId).<SizeF>getParcelableArrayList(
		AppWidgetManager.OPTION_APPWIDGET_SIZES))) {
		widgetManager.getAppWidgetOptions(mAppWidgetId).getParcelableArrayList(
		AppWidgetManager.OPTION_APPWIDGET_SIZES, SizeF.class))) {
		return;
		}
		Bundle options = newOptions.deepCopy();

core/java/android/hardware/input/input_framework.aconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ flag {
		name: "enable_talkback_key_gestures"
		namespace: "accessibility"
		description: "Adds key gesture for TalkBack"
		bug: "375277034"
		bug: "441787329"
		}

		flag {

core/java/com/android/internal/jank/Cuj.java

+22 −1

Original line number	Diff line number	Diff line
		@@ -516,8 +516,21 @@ public class Cuj {
		*/
		public static final int CUJ_AMBIENT_CUE_COLLAPSE = 148;

		/**
		* Tracking transition from primary auth (PIN/pattern/password bouncer) to the biometric auth
		* bouncer during secure lock device two-factor authentication.
		*/
		public static final int CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR = 149;

		/**
		* Tracking bouncer dismissal following two-factor authentication completion in secure
		* lock device.
		*/
		public static final int CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR = 150;

		// When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.
		@VisibleForTesting static final int LAST_CUJ = CUJ_AMBIENT_CUE_COLLAPSE;
		@VisibleForTesting static final int LAST_CUJ =
		CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR;

		/** @hide */
		@IntDef({
		@@ -658,6 +671,8 @@ public class Cuj {
		CUJ_AMBIENT_CUE_HIDE,
		CUJ_AMBIENT_CUE_EXPAND,
		CUJ_AMBIENT_CUE_COLLAPSE,
		CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR,
		CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {}
		@@ -808,6 +823,8 @@ public class Cuj {
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_AMBIENT_CUE_HIDE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__AMBIENT_CUE_HIDE;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_AMBIENT_CUE_EXPAND] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__AMBIENT_CUE_EXPAND;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_AMBIENT_CUE_COLLAPSE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__AMBIENT_CUE_COLLAPSE;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR;
		CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR;
		}

		private Cuj() {
		@@ -1100,6 +1117,10 @@ public class Cuj {
		return "AMBIENT_CUE_EXPAND";
		case CUJ_AMBIENT_CUE_COLLAPSE:
		return "AMBIENT_CUE_COLLAPSE";
		case CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR:
		return "BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_APPEAR";
		case CUJ_BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR:
		return "BOUNCER_SECURE_LOCK_DEVICE_BIOMETRIC_AUTH_DISAPPEAR";
		}
		return "UNKNOWN";
		}