Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 571b700f authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Debug: Add attachJvmtiAgent with classloader 

Add classloader support to android.os.Debug.attachJvmtiAgent. For
the original version without a given classloader, look up the
application's main classloader.

Bug: 65016018
Bug: 70901841
Test: m
Test: cts-tradefed run commandAndExit cts-dev
Change-Id: I649b6883e05dc2f75073fe1f978423f6a7b880df
parent 8353a39e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31036,7 +31036,7 @@ package android.os { 
  }















  public final class Debug {













    method public static void attachJvmtiAgent(java.lang.String, java.lang.String) throws java.io.IOException;













    method public static void attachJvmtiAgent(java.lang.String, java.lang.String, java.lang.ClassLoader) throws java.io.IOException;















    method public static deprecated void changeDebugPort(int);















    method public static void dumpHprofData(java.lang.String) throws java.io.IOException;















    method public static boolean dumpService(java.lang.String, java.io.FileDescriptor, java.lang.String[]);

























core/java/android/os/Debug.java



+15
−9




























Original line number
Diff line number
Diff line








@@ -2352,22 +2352,28 @@ public final class Debug













    }































    /**













     * Attach a library as a jvmti agent to the current runtime.













     * Attach a library as a jvmti agent to the current runtime, with the given classloader













     * determining the library search path.













     * <p>













     * Note: agents may only be attached to debuggable apps. Otherwise, this function will













     * throw a SecurityException.















     *













     * @param library library containing the agent













     * @param options options passed to the agent













     * @param library the library containing the agent.













     * @param options the options passed to the agent.













     * @param classLoader the classloader determining the library search path.















     *













     * @throws IOException If the agent could not be attached













     * @throws IOException if the agent could not be attached.













     * @throws SecurityException if the app is not debuggable.















     */













    public static void attachJvmtiAgent(@NonNull String library, @Nullable String options)













            throws IOException {













    public static void attachJvmtiAgent(@NonNull String library, @Nullable String options,













            @Nullable ClassLoader classLoader) throws IOException {















        Preconditions.checkNotNull(library);















        Preconditions.checkArgument(!library.contains("="));































        if (options == null) {













            VMDebug.attachAgent(library);













            VMDebug.attachAgent(library, classLoader);















        } else {













            VMDebug.attachAgent(library + "=" + options);













            VMDebug.attachAgent(library + "=" + options, classLoader);















        }















    }















}