Merge "Support target process in dynamic instrumentation" into main (12f73839) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,8 @@ import android.os.PowerExemptionManager.ReasonCode;
	import android.os.PowerExemptionManager.TempAllowListType;		import android.os.PowerExemptionManager.TempAllowListType;
	import android.os.TransactionTooLargeException;		import android.os.TransactionTooLargeException;
	import android.os.WorkSource;		import android.os.WorkSource;
			import android.os.instrumentation.IOffsetCallback;
			import android.os.instrumentation.MethodDescriptor;
	import android.util.ArraySet;		import android.util.ArraySet;
	import android.util.Pair;		import android.util.Pair;

	@@ -1351,6 +1353,14 @@ public abstract class ActivityManagerInternal {
	public abstract void killApplicationSync(String pkgName, int appId, int userId,		public abstract void killApplicationSync(String pkgName, int appId, int userId,
	String reason, int exitInfoReason);		String reason, int exitInfoReason);

			/**
			* Queries the offset data for a given method on a process.
			* @hide
			*/
			public abstract void getExecutableMethodFileOffsets(@NonNull String processName,
			int pid, int uid, @NonNull MethodDescriptor methodDescriptor,
			@NonNull IOffsetCallback callback);

	/**		/**
	* Add a creator token for all embedded intents (stored as extra) of the given intent.		* Add a creator token for all embedded intents (stored as extra) of the given intent.
	*		*

core/java/android/app/ActivityThread.java

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -165,6 +165,10 @@ import android.os.TelephonyServiceManager;
	import android.os.Trace;		import android.os.Trace;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
			import android.os.instrumentation.ExecutableMethodFileOffsets;
			import android.os.instrumentation.IOffsetCallback;
			import android.os.instrumentation.MethodDescriptor;
			import android.os.instrumentation.MethodDescriptorParser;
	import android.permission.IPermissionManager;		import android.permission.IPermissionManager;
	import android.provider.BlockedNumberContract;		import android.provider.BlockedNumberContract;
	import android.provider.CalendarContract;		import android.provider.CalendarContract;
	@@ -2236,6 +2240,29 @@ public final class ActivityThread extends ClientTransactionHandler
	args.arg6 = uiTranslationSpec;		args.arg6 = uiTranslationSpec;
	sendMessage(H.UPDATE_UI_TRANSLATION_STATE, args);		sendMessage(H.UPDATE_UI_TRANSLATION_STATE, args);
	}		}

			@Override
			public void getExecutableMethodFileOffsets(
			@NonNull MethodDescriptor methodDescriptor,
			@NonNull IOffsetCallback resultCallback) {
			Method method = MethodDescriptorParser.parseMethodDescriptor(
			getClass().getClassLoader(), methodDescriptor);
			VMDebug.ExecutableMethodFileOffsets location =
			VMDebug.getExecutableMethodFileOffsets(method);
			try {
			if (location == null) {
			resultCallback.onResult(null);
			return;
			}
			ExecutableMethodFileOffsets ret = new ExecutableMethodFileOffsets();
			ret.containerPath = location.getContainerPath();
			ret.containerOffset = location.getContainerOffset();
			ret.methodOffset = location.getMethodOffset();
			resultCallback.onResult(ret);
			} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
			}
			}
	}		}

	private @NonNull SafeCancellationTransport createSafeCancellationTransport(		private @NonNull SafeCancellationTransport createSafeCancellationTransport(

core/java/android/app/IApplicationThread.aidl

+4 −0

core/java/android/os/instrumentation/IDynamicInstrumentationManager.aidl

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package android.os.instrumentation;		package android.os.instrumentation;

	import android.os.instrumentation.ExecutableMethodFileOffsets;		import android.os.instrumentation.IOffsetCallback;
	import android.os.instrumentation.MethodDescriptor;		import android.os.instrumentation.MethodDescriptor;
	import android.os.instrumentation.TargetProcess;		import android.os.instrumentation.TargetProcess;

	@@ -28,6 +28,7 @@ import android.os.instrumentation.TargetProcess;
	interface IDynamicInstrumentationManager {		interface IDynamicInstrumentationManager {
	/** Provides ART metadata about the described compiled method within the target process */		/** Provides ART metadata about the described compiled method within the target process */
	@PermissionManuallyEnforced		@PermissionManuallyEnforced
	@nullable ExecutableMethodFileOffsets getExecutableMethodFileOffsets(		void getExecutableMethodFileOffsets(
	in TargetProcess targetProcess, in MethodDescriptor methodDescriptor);		in TargetProcess targetProcess, in MethodDescriptor methodDescriptor,
			in IOffsetCallback callback);
	}		}

core/java/android/os/instrumentation/IOffsetCallback.aidl

0 → 100644

+28 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2024 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package android.os.instrumentation;

			import android.os.instrumentation.ExecutableMethodFileOffsets;

			/**
			* System private API for providing dynamic instrumentation offset results.
			*
			* {@hide}
			*/
			oneway interface IOffsetCallback {
			void onResult(in @nullable ExecutableMethodFileOffsets offsets);
			}