Snap for 12896565 from bda4276db23786ef29e97e9f6dd715e1e954d359 to 25Q2-release (c9f92dfb) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -141,6 +141,15 @@ public abstract class ActivityManagerInternal {
	public abstract boolean startIsolatedProcess(String entryPoint, String[] mainArgs,		public abstract boolean startIsolatedProcess(String entryPoint, String[] mainArgs,
	String processName, String abiOverride, int uid, Runnable crashHandler);		String processName, String abiOverride, int uid, Runnable crashHandler);

			/**
			* Called when a user is being deleted. This can happen during normal device usage
			* or just at startup, when partially removed users are purged. Any state persisted by the
			* ActivityManager should be purged now.
			*
			* @param userId The user being cleaned up.
			*/
			public abstract void onUserRemoving(@UserIdInt int userId);

	/**		/**
	* Called when a user has been deleted. This can happen during normal device usage		* Called when a user has been deleted. This can happen during normal device usage
	* or just at startup, when partially removed users are purged. Any state persisted by the		* or just at startup, when partially removed users are purged. Any state persisted by the

core/java/android/app/ActivityThread.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,6 @@ import android.content.pm.ServiceInfo;
	import android.content.res.AssetManager;		import android.content.res.AssetManager;
	import android.content.res.CompatibilityInfo;		import android.content.res.CompatibilityInfo;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.content.res.ResourceTimer;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.content.res.ResourcesImpl;		import android.content.res.ResourcesImpl;
	import android.content.res.loader.ResourcesLoader;		import android.content.res.loader.ResourcesLoader;
	@@ -5254,7 +5253,6 @@ public final class ActivityThread extends ClientTransactionHandler

	Resources.dumpHistory(pw, "");		Resources.dumpHistory(pw, "");
	pw.flush();		pw.flush();
	ResourceTimer.dumpTimers(info.fd.getFileDescriptor(), "-refresh");
	if (info.finishCallback != null) {		if (info.finishCallback != null) {
	info.finishCallback.sendResult(null);		info.finishCallback.sendResult(null);
	}		}

core/java/android/app/KeyguardManager.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,6 @@ import com.android.internal.widget.VerifyCredentialResponse;
	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.nio.charset.Charset;		import java.nio.charset.Charset;
	import java.util.Arrays;
	import java.util.List;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;
	import java.util.concurrent.Executor;		import java.util.concurrent.Executor;
	@@ -1064,7 +1063,7 @@ public class KeyguardManager {
	Log.e(TAG, "Save lock exception", e);		Log.e(TAG, "Save lock exception", e);
	success = false;		success = false;
	} finally {		} finally {
	Arrays.fill(password, (byte) 0);		LockPatternUtils.zeroize(password);
	}		}
	return success;		return success;
	}		}

core/java/android/app/LoadedApk.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1129,6 +1129,10 @@ public final class LoadedApk {

	@UnsupportedAppUsage		@UnsupportedAppUsage
	public ClassLoader getClassLoader() {		public ClassLoader getClassLoader() {
			ClassLoader ret = mClassLoader;
			if (ret != null) {
			return ret;
			}
	synchronized (mLock) {		synchronized (mLock) {
	if (mClassLoader == null) {		if (mClassLoader == null) {
	createOrUpdateClassLoaderLocked(null /addedPaths/);		createOrUpdateClassLoaderLocked(null /addedPaths/);

core/java/android/app/Notification.java

+19 −17

Original line number	Original line	Diff line number	Diff line
	@@ -1968,6 +1968,13 @@ public class Notification implements Parcelable
	@SystemApi		@SystemApi
	public static final int SEMANTIC_ACTION_CONVERSATION_IS_PHISHING = 12;		public static final int SEMANTIC_ACTION_CONVERSATION_IS_PHISHING = 12;

			/**
			* {@link #extras} key to a boolean defining if this action requires special visual
			* treatment.
			* @hide
			*/
			public static final String EXTRA_IS_MAGIC = "android.extra.IS_MAGIC";

	private final Bundle mExtras;		private final Bundle mExtras;
	@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
	private Icon mIcon;		private Icon mIcon;
	@@ -5984,6 +5991,15 @@ public class Notification implements Parcelable
	}		}
	setHeaderlessVerticalMargins(contentView, p, hasSecondLine);		setHeaderlessVerticalMargins(contentView, p, hasSecondLine);

			// Update margins to leave space for the top line (but not for headerless views like
			// HUNS, which use a different layout that already accounts for that).
			if (Flags.notificationsRedesignTemplates() && !p.mHeaderless) {
			int margin = getContentMarginTop(mContext,
			R.dimen.notification_2025_content_margin_top);
			contentView.setViewLayoutMargin(R.id.notification_main_column,
			RemoteViews.MARGIN_TOP, margin, TypedValue.COMPLEX_UNIT_PX);
			}

	return contentView;		return contentView;
	}		}

	@@ -6207,7 +6223,7 @@ public class Notification implements Parcelable
	int textColor = Colors.flattenAlpha(getPrimaryTextColor(p), pillColor);		int textColor = Colors.flattenAlpha(getPrimaryTextColor(p), pillColor);
	contentView.setInt(R.id.expand_button, "setDefaultTextColor", textColor);		contentView.setInt(R.id.expand_button, "setDefaultTextColor", textColor);
	contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);		contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);
	// Use different highlighted colors for e.g. unopened groups		// Use different highlighted colors for conversations' unread count
	if (p.mHighlightExpander) {		if (p.mHighlightExpander) {
	pillColor = Colors.flattenAlpha(		pillColor = Colors.flattenAlpha(
	getColors(p).getTertiaryFixedDimAccentColor(), bgColor);		getColors(p).getTertiaryFixedDimAccentColor(), bgColor);
	@@ -6456,16 +6472,6 @@ public class Notification implements Parcelable
	big.setColorStateList(R.id.snooze_button, "setImageTintList", actionColor);		big.setColorStateList(R.id.snooze_button, "setImageTintList", actionColor);
	big.setColorStateList(R.id.bubble_button, "setImageTintList", actionColor);		big.setColorStateList(R.id.bubble_button, "setImageTintList", actionColor);

	// Update margins to leave space for the top line (but not for HUNs, which use a
	// different layout that already accounts for that).
	if (Flags.notificationsRedesignTemplates()
	&& p.mViewType != StandardTemplateParams.VIEW_TYPE_HEADS_UP) {
	int margin = getContentMarginTop(mContext,
	R.dimen.notification_2025_content_margin_top);
	big.setViewLayoutMargin(R.id.notification_main_column, RemoteViews.MARGIN_TOP,
	margin, TypedValue.COMPLEX_UNIT_PX);
	}

	boolean validRemoteInput = false;		boolean validRemoteInput = false;

	// In the UI, contextual actions appear separately from the standard actions, so we		// In the UI, contextual actions appear separately from the standard actions, so we
	@@ -6807,8 +6813,6 @@ public class Notification implements Parcelable
	public RemoteViews makeNotificationGroupHeader() {		public RemoteViews makeNotificationGroupHeader() {
	return makeNotificationHeader(mParams.reset()		return makeNotificationHeader(mParams.reset()
	.viewType(StandardTemplateParams.VIEW_TYPE_GROUP_HEADER)		.viewType(StandardTemplateParams.VIEW_TYPE_GROUP_HEADER)
	// Highlight group expander until the group is first opened
	.highlightExpander(Flags.notificationsRedesignTemplates())
	.fillTextsFrom(this));		.fillTextsFrom(this));
	}		}

	@@ -6984,14 +6988,12 @@ public class Notification implements Parcelable
	* @param useRegularSubtext uses the normal subtext set if there is one available. Otherwise		* @param useRegularSubtext uses the normal subtext set if there is one available. Otherwise
	* a new subtext is created consisting of the content of the		* a new subtext is created consisting of the content of the
	* notification.		* notification.
	* @param highlightExpander whether the expander should use the highlighted colors
	* @hide		* @hide
	*/		*/
	public RemoteViews makeLowPriorityContentView(boolean useRegularSubtext,		public RemoteViews makeLowPriorityContentView(boolean useRegularSubtext) {
	boolean highlightExpander) {
	StandardTemplateParams p = mParams.reset()		StandardTemplateParams p = mParams.reset()
	.viewType(StandardTemplateParams.VIEW_TYPE_MINIMIZED)		.viewType(StandardTemplateParams.VIEW_TYPE_MINIMIZED)
	.highlightExpander(highlightExpander)		.highlightExpander(false)
	.fillTextsFrom(this);		.fillTextsFrom(this);
	if (!useRegularSubtext \|\| TextUtils.isEmpty(p.mSubText)) {		if (!useRegularSubtext \|\| TextUtils.isEmpty(p.mSubText)) {
	p.summaryText(createSummaryText());		p.summaryText(createSummaryText());