Merge "Skip OomAdjuster update in bindService for self-bindings" into main (3ff30271) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -319,6 +319,10 @@ public final class ActivityThread extends ClientTransactionHandler
		public static final int SERVICE_DONE_EXECUTING_START = 1;
		/** Type for IActivityManager.serviceDoneExecuting: done stopping (destroying) service */
		public static final int SERVICE_DONE_EXECUTING_STOP = 2;
		/** Type for IActivityManager.serviceDoneExecuting: done with an onRebind call */
		public static final int SERVICE_DONE_EXECUTING_REBIND = 3;
		/** Type for IActivityManager.serviceDoneExecuting: done with an onUnbind call */
		public static final int SERVICE_DONE_EXECUTING_UNBIND = 4;

		/** Use foreground GC policy (less pause time) and higher JIT weight. */
		private static final int VM_PROCESS_STATE_JANK_PERCEPTIBLE = 0;
		@@ -4882,7 +4886,7 @@ public final class ActivityThread extends ClientTransactionHandler
		mServices.put(data.token, service);
		try {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0);
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0, null);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -4913,7 +4917,7 @@ public final class ActivityThread extends ClientTransactionHandler
		} else {
		s.onRebind(data.intent);
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0);
		data.token, SERVICE_DONE_EXECUTING_REBIND, 0, 0, data.intent);
		}
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		@@ -4943,7 +4947,7 @@ public final class ActivityThread extends ClientTransactionHandler
		data.token, data.intent, doRebind);
		} else {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0);
		data.token, SERVICE_DONE_EXECUTING_UNBIND, 0, 0, data.intent);
		}
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		@@ -5057,7 +5061,7 @@ public final class ActivityThread extends ClientTransactionHandler

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

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

core/java/android/app/IActivityManager.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,8 @@ interface IActivityManager {
		@UnsupportedAppUsage
		ParceledListSlice getRecentTasks(int maxNum, int flags, int userId);
		@UnsupportedAppUsage
		oneway void serviceDoneExecuting(in IBinder token, int type, int startId, int res);
		oneway void serviceDoneExecuting(in IBinder token, int type, int startId, int res,
		in Intent intent);
		/** @deprecated Use {@link #getIntentSenderWithFeature} instead */
		@UnsupportedAppUsage(maxTargetSdk=29, publicAlternatives="Use {@link PendingIntent#getIntentSender()} instead")
		IIntentSender getIntentSender(int type, in String packageName, in IBinder token,