Use const pointers where appropriate in dynamic_instrumentation_manager
This change also updates a comment in Shell/AndroidManifest.xml to
indicate the correct name for CtsDynamicInstrumentationManagerTest.
Bug: 372925025
Test: CtsDynamicInstrumentationManagerTest
Flag: android.uprobestats.flags.executable_method_file_offsets
Change-Id: If6f255bec043cce5ca275bcf0b70337404c0353d
diff --git a/native/android/dynamic_instrumentation_manager.cpp b/native/android/dynamic_instrumentation_manager.cpp
index d9bacb1..5322136 100644
--- a/native/android/dynamic_instrumentation_manager.cpp
+++ b/native/android/dynamic_instrumentation_manager.cpp
@@ -65,7 +65,7 @@
}
void ADynamicInstrumentationManager_TargetProcess_destroy(
- ADynamicInstrumentationManager_TargetProcess* instance) {
+ const ADynamicInstrumentationManager_TargetProcess* instance) {
delete instance;
}
@@ -96,7 +96,7 @@
}
void ADynamicInstrumentationManager_MethodDescriptor_destroy(
- ADynamicInstrumentationManager_MethodDescriptor* instance) {
+ const ADynamicInstrumentationManager_MethodDescriptor* instance) {
delete instance;
}
@@ -112,29 +112,29 @@
}
const char* ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getContainerPath(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
return instance->containerPath.c_str();
}
uint64_t ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getContainerOffset(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
return instance->containerOffset;
}
uint64_t ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getMethodOffset(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
return instance->methodOffset;
}
void ADynamicInstrumentationManager_ExecutableMethodFileOffsets_destroy(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* instance) {
delete instance;
}
int32_t ADynamicInstrumentationManager_getExecutableMethodFileOffsets(
const ADynamicInstrumentationManager_TargetProcess* targetProcess,
const ADynamicInstrumentationManager_MethodDescriptor* methodDescriptor,
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets** out) {
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets** out) {
android::os::instrumentation::TargetProcess targetProcessParcel;
targetProcessParcel.uid = targetProcess->uid;
targetProcessParcel.pid = targetProcess->pid;
diff --git a/native/android/include_platform/android/dynamic_instrumentation_manager.h b/native/android/include_platform/android/dynamic_instrumentation_manager.h
index 6c46288..ab9f370 100644
--- a/native/android/include_platform/android/dynamic_instrumentation_manager.h
+++ b/native/android/include_platform/android/dynamic_instrumentation_manager.h
@@ -51,7 +51,7 @@
* @param instance returned from ADynamicInstrumentationManager_TargetProcess_create.
*/
void ADynamicInstrumentationManager_TargetProcess_destroy(
- ADynamicInstrumentationManager_TargetProcess* _Nonnull instance) __INTRODUCED_IN(36);
+ const ADynamicInstrumentationManager_TargetProcess* _Nonnull instance) __INTRODUCED_IN(36);
/**
* Initializes an ADynamicInstrumentationManager_MethodDescriptor. Caller must clean up when they
@@ -74,7 +74,8 @@
* @param instance returned from ADynamicInstrumentationManager_MethodDescriptor_create.
*/
void ADynamicInstrumentationManager_MethodDescriptor_destroy(
- ADynamicInstrumentationManager_MethodDescriptor* _Nonnull instance) __INTRODUCED_IN(36);
+ const ADynamicInstrumentationManager_MethodDescriptor* _Nonnull instance)
+ __INTRODUCED_IN(36);
/**
* Get the containerPath calculated by
@@ -83,7 +84,7 @@
* @return The OS path of the containing file.
*/
const char* _Nullable ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getContainerPath(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
__INTRODUCED_IN(36);
/**
* Get the containerOffset calculated by
@@ -92,7 +93,7 @@
* @return The offset of the containing file within the process' memory.
*/
uint64_t ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getContainerOffset(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
__INTRODUCED_IN(36);
/**
* Get the methodOffset calculated by ADynamicInstrumentationManager_getExecutableMethodFileOffsets.
@@ -100,7 +101,7 @@
* @return The offset of the method within the containing file.
*/
uint64_t ADynamicInstrumentationManager_ExecutableMethodFileOffsets_getMethodOffset(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
__INTRODUCED_IN(36);
/**
* Clean up an ADynamicInstrumentationManager_ExecutableMethodFileOffsets.
@@ -108,7 +109,7 @@
* @param instance returned from ADynamicInstrumentationManager_getExecutableMethodFileOffsets.
*/
void ADynamicInstrumentationManager_ExecutableMethodFileOffsets_destroy(
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull instance)
__INTRODUCED_IN(36);
/**
* Provides ART metadata about the described java method within the target process.
@@ -124,7 +125,7 @@
int32_t ADynamicInstrumentationManager_getExecutableMethodFileOffsets(
const ADynamicInstrumentationManager_TargetProcess* _Nonnull targetProcess,
const ADynamicInstrumentationManager_MethodDescriptor* _Nonnull methodDescriptor,
- ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nonnull* _Nullable out)
+ const ADynamicInstrumentationManager_ExecutableMethodFileOffsets* _Nullable* _Nonnull out)
__INTRODUCED_IN(36);
__END_DECLS