Snap for 12770256 from 450f8ab14dfecc9a5061d30c8e3d6864cc21fb9b to 25Q1-release (dd420b43) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+16 −24

Original line number	Diff line number	Diff line
		@@ -14839,10 +14839,7 @@ public class Notification implements Parcelable

		if (isColorized) {
		if (rawColor == COLOR_DEFAULT) {
		int[] attrs = {R.attr.materialColorSecondary};
		try (TypedArray ta = obtainDayNightAttributes(ctx, attrs)) {
		mBackgroundColor = getColor(ta, 0, Color.WHITE);
		}
		mBackgroundColor = ctx.getColor(R.color.materialColorSecondary);
		} else {
		mBackgroundColor = rawColor;
		}
		@@ -14874,30 +14871,25 @@ public class Notification implements Parcelable
		mRippleAlpha = 0x33;
		} else {
		int[] attrs = {
		R.attr.materialColorSurfaceContainerHigh,
		R.attr.materialColorOnSurface,
		R.attr.materialColorOnSurfaceVariant,
		R.attr.materialColorPrimary,
		R.attr.materialColorSecondary,
		R.attr.materialColorTertiary,
		R.attr.materialColorOnTertiary,
		R.attr.materialColorTertiaryFixedDim,
		R.attr.materialColorOnTertiaryFixed,
		R.attr.colorError,
		R.attr.colorControlHighlight
		};

		mBackgroundColor = ctx.getColor(R.color.materialColorSurfaceContainerHigh);
		mPrimaryTextColor = ctx.getColor(R.color.materialColorOnSurface);
		mSecondaryTextColor = ctx.getColor(R.color.materialColorOnSurfaceVariant);
		mPrimaryAccentColor = ctx.getColor(R.color.materialColorPrimary);
		mSecondaryAccentColor = ctx.getColor(R.color.materialColorSecondary);
		mTertiaryAccentColor = ctx.getColor(R.color.materialColorTertiary);
		mOnTertiaryAccentTextColor = ctx.getColor(R.color.materialColorOnTertiary);
		mTertiaryFixedDimAccentColor = ctx.getColor(
		R.color.materialColorTertiaryFixedDim);
		mOnTertiaryFixedAccentTextColor = ctx.getColor(
		R.color.materialColorOnTertiaryFixed);

		try (TypedArray ta = obtainDayNightAttributes(ctx, attrs)) {
		mBackgroundColor = getColor(ta, 0, nightMode ? Color.BLACK : Color.WHITE);
		mPrimaryTextColor = getColor(ta, 1, COLOR_INVALID);
		mSecondaryTextColor = getColor(ta, 2, COLOR_INVALID);
		mPrimaryAccentColor = getColor(ta, 3, COLOR_INVALID);
		mSecondaryAccentColor = getColor(ta, 4, COLOR_INVALID);
		mTertiaryAccentColor = getColor(ta, 5, COLOR_INVALID);
		mOnTertiaryAccentTextColor = getColor(ta, 6, COLOR_INVALID);
		mTertiaryFixedDimAccentColor = getColor(ta, 7, COLOR_INVALID);
		mOnTertiaryFixedAccentTextColor = getColor(ta, 8, COLOR_INVALID);
		mErrorColor = getColor(ta, 9, COLOR_INVALID);
		mRippleAlpha = Color.alpha(getColor(ta, 10, 0x33ffffff));
		mErrorColor = getColor(ta, 0, COLOR_INVALID);
		mRippleAlpha = Color.alpha(getColor(ta, 1, 0x33ffffff));
		}
		mContrastColor = calculateContrastColor(ctx, rawColor, mPrimaryAccentColor,
		mBackgroundColor, nightMode);

core/java/android/app/NotificationManager.java

+140 −84

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/SystemServiceRegistry.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -289,6 +289,7 @@ import com.android.internal.os.IDropBoxManagerService;
		import com.android.internal.policy.PhoneLayoutInflater;
		import com.android.internal.util.Preconditions;

		import java.time.InstantSource;
		import java.util.Map;
		import java.util.Objects;

		@@ -625,7 +626,7 @@ public final class SystemServiceRegistry {
		com.android.internal.R.style.Theme_Holo_Dialog,
		com.android.internal.R.style.Theme_DeviceDefault_Dialog,
		com.android.internal.R.style.Theme_DeviceDefault_Light_Dialog)),
		ctx.mMainThread.getHandler());
		InstantSource.system());
		}});

		registerService(Context.PEOPLE_SERVICE, PeopleManager.class,

core/java/android/app/appfunctions/AppFunctionManager.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.os.ICancellationSignal;
		import android.os.OutcomeReceiver;
		import android.os.ParcelableException;
		import android.os.RemoteException;
		import android.os.SystemClock;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -179,7 +180,8 @@ public final class AppFunctionManager {

		ExecuteAppFunctionAidlRequest aidlRequest =
		new ExecuteAppFunctionAidlRequest(
		request, mContext.getUser(), mContext.getPackageName());
		request, mContext.getUser(), mContext.getPackageName(),
		/* requestTime= */ SystemClock.elapsedRealtime());

		try {
		ICancellationSignal cancellationTransport =

core/java/android/app/appfunctions/ExecuteAppFunctionAidlRequest.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -41,8 +41,9 @@ public final class ExecuteAppFunctionAidlRequest implements Parcelable {
		ExecuteAppFunctionRequest.CREATOR.createFromParcel(in);
		UserHandle userHandle = UserHandle.CREATOR.createFromParcel(in);
		String callingPackage = in.readString8();
		long requestTime = in.readLong();
		return new ExecuteAppFunctionAidlRequest(
		clientRequest, userHandle, callingPackage);
		clientRequest, userHandle, callingPackage, requestTime);
		}

		@Override
		@@ -60,11 +61,15 @@ public final class ExecuteAppFunctionAidlRequest implements Parcelable {
		/** The package name of the app that is requesting to execute the app function. */
		private final String mCallingPackage;

		public ExecuteAppFunctionAidlRequest(
		ExecuteAppFunctionRequest clientRequest, UserHandle userHandle, String callingPackage) {
		/** The time of calling executeAppFunction(). */
		private final long mRequestTime;

		public ExecuteAppFunctionAidlRequest(ExecuteAppFunctionRequest clientRequest,
		UserHandle userHandle, String callingPackage, long requestTime) {
		this.mClientRequest = Objects.requireNonNull(clientRequest);
		this.mUserHandle = Objects.requireNonNull(userHandle);
		this.mCallingPackage = Objects.requireNonNull(callingPackage);
		this.mRequestTime = requestTime;
		}

		@Override
		@@ -77,6 +82,7 @@ public final class ExecuteAppFunctionAidlRequest implements Parcelable {
		mClientRequest.writeToParcel(dest, flags);
		mUserHandle.writeToParcel(dest, flags);
		dest.writeString8(mCallingPackage);
		dest.writeLong(mRequestTime);
		}

		/** Returns the client request to execute an app function. */
		@@ -96,4 +102,9 @@ public final class ExecuteAppFunctionAidlRequest implements Parcelable {
		public String getCallingPackage() {
		return mCallingPackage;
		}

		/** Returns the time of calling executeAppFunction(). */
		public long getRequestTime() {
		return mRequestTime;
		}
		}