commit 526f39083719b2612d266210c09cad998d6751e7
author Alex Light <allight@google.com> Tue Nov 28 19:20:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 28 19:20:28 2017 +0000
tree 883a1697a307dd7efaab3b61f5c7284ef8fa7f96
parent 778030373cf9817fed950121b9cc3bdd6d1b4569
parent e3361f446a024f8a2f9ccadc757d2c50dbf6f005

Disable can_redefine_classes capability on 'Dalvik' hosts. am: f0f71b9e4d
am: e3361f446a

Change-Id: I59d2d7bde6d9c96f617da0034bd64fe377d30e92

src/share/back/VirtualMachineImpl.c

diff --git a/src/share/back/VirtualMachineImpl.c b/src/share/back/VirtualMachineImpl.c
index e856392..dfcdfb2 100644
--- a/src/share/back/VirtualMachineImpl.c
+++ b/src/share/back/VirtualMachineImpl.c
@@ -713,6 +713,9 @@
         return JNI_TRUE;
     }
 
+    // ANDROID-CHANGED: We want to adjust the capabilities slightly if we are on android.
+    jboolean is_android_runtime = strcmp(gdata->property_java_vm_name, "Dalvik") == 0;
+
     (void)outStream_writeBoolean(out, (jboolean)caps.can_generate_field_modification_events);
     (void)outStream_writeBoolean(out, (jboolean)caps.can_generate_field_access_events);
     (void)outStream_writeBoolean(out, (jboolean)caps.can_get_bytecodes);
@@ -722,7 +725,11 @@
     (void)outStream_writeBoolean(out, (jboolean)caps.can_get_monitor_info);
 
     /* new since JDWP version 1.4 */
-    (void)outStream_writeBoolean(out, (jboolean)caps.can_redefine_classes);
+    /* ANDROID-CHANGED: some jdwp clients will send us class files for redefineClasses which we do
+     * not support. Set this capability to false and set reserved32 instead to indicate that we do
+     * support .dex file class redefinition.
+     */
+    (void)outStream_writeBoolean(out, (jboolean)caps.can_redefine_classes && !is_android_runtime);
     (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE /* can_add_method */ );
     (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE /* can_unrestrictedly_redefine_classes */ );
     /* 11: canPopFrames */
@@ -757,7 +764,10 @@
     (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE); /* 29 */
     (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE); /* 30 */
     (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE); /* 31 */
-    (void)outStream_writeBoolean(out, (jboolean)JNI_FALSE); /* 32 */
+    /* ANDROID-CHANGED: Use the reserved32 capability to notify clients that we can support dex
+     * class redefinition.
+     */
+    (void)outStream_writeBoolean(out, (jboolean)caps.can_redefine_classes && is_android_runtime);
     return JNI_TRUE;
 }