Snap for 13385035 from 14a0162e3bdcea76ceb6e4beb40e97a44d3e2d9e to 25Q3-release (6a198116) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3726,6 +3726,7 @@ public final class QuotaController extends StateController {
		case KEY_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS:
		case KEY_IN_QUOTA_BUFFER_MS:
		case KEY_MAX_EXECUTION_TIME_MS:
		case KEY_WINDOW_SIZE_EXEMPTED_MS:
		case KEY_WINDOW_SIZE_ACTIVE_MS:
		case KEY_WINDOW_SIZE_WORKING_MS:
		case KEY_WINDOW_SIZE_FREQUENT_MS:

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16475,7 +16475,7 @@ package android.graphics {

		public final class Gainmap implements android.os.Parcelable {
		ctor public Gainmap(@NonNull android.graphics.Bitmap);
		ctor @FlaggedApi("com.android.graphics.hwui.flags.gainmap_constructor_with_metadata") public Gainmap(@NonNull android.graphics.Gainmap, @NonNull android.graphics.Bitmap);
		ctor public Gainmap(@NonNull android.graphics.Gainmap, @NonNull android.graphics.Bitmap);
		method public int describeContents();
		method @FlaggedApi("com.android.graphics.hwui.flags.iso_gainmap_apis") @Nullable public android.graphics.ColorSpace getAlternativeImagePrimaries();
		method @NonNull public float getDisplayRatioForFullHdr();

core/java/android/app/ActivityThread.java

+18 −12

Original line number	Diff line number	Diff line
		@@ -939,11 +939,14 @@ public final class ActivityThread extends ClientTransactionHandler
		@UnsupportedAppUsage
		IBinder token;
		@UnsupportedAppUsage
		IBinder bindToken;
		@UnsupportedAppUsage
		Intent intent;
		boolean rebind;
		long bindSeq;
		public String toString() {
		return "BindServiceData{token=" + token + " intent=" + intent
		+ " bindToken = " + bindToken
		+ " bindSeq=" + bindSeq + "}";
		}
		}
		@@ -1219,18 +1222,20 @@ public final class ActivityThread extends ClientTransactionHandler
		sendMessage(H.CREATE_SERVICE, s);
		}

		public final void scheduleBindService(IBinder token, Intent intent,
		public final void scheduleBindService(IBinder token, IBinder bindToken, Intent intent,
		boolean rebind, int processState, long bindSeq) {
		updateProcessState(processState, false);
		BindServiceData s = new BindServiceData();
		s.token = token;
		s.bindToken = bindToken;
		s.intent = intent;
		s.rebind = rebind;
		s.bindSeq = bindSeq;

		if (DEBUG_SERVICE)
		Slog.v(TAG, "scheduleBindService token=" + token + " intent=" + intent + " uid="
		+ Binder.getCallingUid() + " pid=" + Binder.getCallingPid());
		Slog.v(TAG, "scheduleBindService token=" + token + " bindToken=" + bindToken
		+ " intent=" + intent + " uid=" + Binder.getCallingUid()
		+ " pid=" + Binder.getCallingPid());

		if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
		Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleBindService. token="
		@@ -1239,9 +1244,10 @@ public final class ActivityThread extends ClientTransactionHandler
		sendMessage(H.BIND_SERVICE, s);
		}

		public final void scheduleUnbindService(IBinder token, Intent intent) {
		public final void scheduleUnbindService(IBinder token, IBinder bindToken, Intent intent) {
		BindServiceData s = new BindServiceData();
		s.token = token;
		s.bindToken = bindToken;
		s.intent = intent;
		s.bindSeq = -1;

		@@ -5314,7 +5320,7 @@ public final class ActivityThread extends ClientTransactionHandler
		mServices.put(data.token, service);
		try {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0, null);
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -5341,11 +5347,11 @@ public final class ActivityThread extends ClientTransactionHandler
		if (!data.rebind) {
		IBinder binder = s.onBind(data.intent);
		ActivityManager.getService().publishService(
		data.token, data.intent, binder);
		data.token, data.bindToken, binder);
		} else {
		s.onRebind(data.intent);
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_REBIND, 0, 0, data.intent);
		data.token, SERVICE_DONE_EXECUTING_REBIND, 0, 0);
		}
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		@@ -5372,10 +5378,10 @@ public final class ActivityThread extends ClientTransactionHandler
		try {
		if (doRebind) {
		ActivityManager.getService().unbindFinished(
		data.token, data.intent);
		data.token, data.bindToken);
		} else {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_UNBIND, 0, 0, data.intent);
		data.token, SERVICE_DONE_EXECUTING_UNBIND, 0, 0);
		}
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		@@ -5489,8 +5495,8 @@ public final class ActivityThread extends ClientTransactionHandler
		QueuedWork.waitToFinish();

		try {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_START, data.startId, res, null);
		ActivityManager.getService().serviceDoneExecuting(data.token,
		SERVICE_DONE_EXECUTING_START, data.startId, res);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -5522,7 +5528,7 @@ public final class ActivityThread extends ClientTransactionHandler

		try {
		ActivityManager.getService().serviceDoneExecuting(
		token, SERVICE_DONE_EXECUTING_STOP, 0, 0, null);
		token, SERVICE_DONE_EXECUTING_STOP, 0, 0);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/ContextImpl.java

+3 −21

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.StrictMode.vmIncorrectContextUseEnabled;
		import static android.permission.flags.Flags.shouldRegisterAttributionSource;
		import static android.view.WindowManager.LayoutParams.WindowType;
		import static android.window.WindowContext.registerCleaner;

		import android.annotation.CallbackExecutor;
		import android.annotation.IntDef;
		@@ -3431,7 +3430,7 @@ class ContextImpl extends Context {
		// if this Context is not a WindowContext. WindowContext finalization is handled in
		// WindowContext class.
		try {
		if (!isCleanerEnabled() && mToken instanceof WindowTokenClient && mOwnsToken) {
		if (mToken instanceof WindowTokenClient && mOwnsToken) {
		WindowTokenClientController.getInstance()
		.detachIfNeeded((WindowTokenClient) mToken);
		}
		@@ -3440,15 +3439,6 @@ class ContextImpl extends Context {
		}
		}

		/**
		* Returns {@code true} if {@link WindowContext#registerCleaner} is enabled.
		*/
		private static boolean isCleanerEnabled() {
		return com.android.window.flags.Flags.cleanUpWindowContextWithCleaner()
		// Cleaner only works on SystemUiContext or WindowContext.
		&& com.android.window.flags.Flags.trackSystemUiContextBeforeWms();
		}

		@UnsupportedAppUsage
		static ContextImpl createSystemContext(ActivityThread mainThread) {
		LoadedApk packageInfo = new LoadedApk(mainThread);
		@@ -3476,22 +3466,14 @@ class ContextImpl extends Context {

		// Step 2. Create a SystemUiContext to wrap the ContextImpl, which enables to listen to
		// its config updates.
		final Context systemUiContext;
		if (com.android.window.flags.Flags.trackSystemUiContextBeforeWms()) {
		systemUiContext = new SystemUiContext(context);
		final SystemUiContext systemUiContext = new SystemUiContext(context);
		context.setOuterContext(systemUiContext);
		} else {
		systemUiContext = context;
		}
		token.attachContext(systemUiContext);

		// Step 3. Associate the SystemUiContext with the display specified with ID.
		WindowTokenClientController.getInstance().attachToDisplayContent(token, displayId);
		context.mContextType = CONTEXT_TYPE_SYSTEM_OR_SYSTEM_UI;
		context.mOwnsToken = true;
		if (isCleanerEnabled()) {
		registerCleaner(systemUiContext);
		}
		return systemUiContext;
		}

core/java/android/app/IActivityManager.aidl

+3 −4

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ interface IActivityManager {
		void updateServiceGroup(in IServiceConnection connection, int group, int importance);
		@UnsupportedAppUsage
		boolean unbindService(in IServiceConnection connection);
		void publishService(in IBinder token, in Intent intent, in IBinder service);
		void publishService(in IBinder token, in IBinder bindToken, in IBinder service);
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		void setDebugApp(in String packageName, boolean waitForDebugger, boolean persistent);
		void setAgentApp(in String packageName, @nullable String agent);
		@@ -301,8 +301,7 @@ interface IActivityManager {
		@UnsupportedAppUsage
		ParceledListSlice getRecentTasks(int maxNum, int flags, int userId);
		@UnsupportedAppUsage
		oneway void serviceDoneExecuting(in IBinder token, int type, int startId, int res,
		in Intent intent);
		oneway void serviceDoneExecuting(in IBinder token, int type, int startId, int res);
		/** @deprecated Use {@link #getIntentSenderWithFeature} instead */
		@UnsupportedAppUsage(maxTargetSdk=29, publicAlternatives="Use {@link PendingIntent#getIntentSender()} instead")
		IIntentSender getIntentSender(int type, in String packageName, in IBinder token,
		@@ -328,7 +327,7 @@ interface IActivityManager {
		oneway void removeContentProvider(in IBinder connection, boolean stable);
		@UnsupportedAppUsage
		void setRequestedOrientation(in IBinder token, int requestedOrientation);
		void unbindFinished(in IBinder token, in Intent service);
		void unbindFinished(in IBinder token, in IBinder bindToken);
		@UnsupportedAppUsage
		void setProcessImportant(in IBinder token, int pid, boolean isForeground, String reason);
		void setServiceForeground(in ComponentName className, in IBinder token,