commit b07fc736e3c49b0ec373c3e030846ce4765036e3
author Mythri Alle <mythria@google.com> Mon Oct 21 14:20:43 2024 +0000
committer Mythri Alle <mythria@google.com> Tue Oct 22 12:00:46 2024 +0000
tree 591d8d2b60d6b55708153c888d8847f373b27f09
parent 72f6bb93a33b224bd85320bbcd231f5bbf8bff5a

Use ScopedObjectAccess instead of ScopedFastNativeObjectAccess

It was on oversight in aosp/3038373 to use ScopedFastNativeObjectAccess
for non fast native methods.

Bug: 374236423
Test: art/test.py. Also verified manually that it fixes eng builds
Change-Id: I54179e1a5bb53f96c83ff5aede251f26d240e3db

runtime/native/dalvik_system_VMDebug.cc

diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc
index 9d7a12c..74b9199 100644
--- a/runtime/native/dalvik_system_VMDebug.cc
+++ b/runtime/native/dalvik_system_VMDebug.cc
@@ -629,7 +629,7 @@
 }
 
 static void VMDebug_setCurrentProcessName(JNIEnv* env, jclass, jstring process_name) {
-  ScopedFastNativeObjectAccess soa(env);
+  ScopedObjectAccess soa(env);
 
   // Android application ID naming convention states:
   // "The name can contain uppercase or lowercase letters, numbers, and underscores ('_')"
@@ -640,7 +640,7 @@
 }
 
 static void VMDebug_addApplication(JNIEnv* env, jclass, jstring package_name) {
-  ScopedFastNativeObjectAccess soa(env);
+  ScopedObjectAccess soa(env);
 
   // Android application ID naming convention states:
   // "The name can contain uppercase or lowercase letters, numbers, and underscores ('_')"
@@ -651,7 +651,7 @@
 }
 
 static void VMDebug_removeApplication(JNIEnv* env, jclass, jstring package_name) {
-  ScopedFastNativeObjectAccess soa(env);
+  ScopedObjectAccess soa(env);
 
   // Android application ID naming convention states:
   // "The name can contain uppercase or lowercase letters, numbers, and underscores ('_')"
@@ -662,12 +662,12 @@
 }
 
 static void VMDebug_setWaitingForDebugger(JNIEnv* env, jclass, jboolean waiting) {
-  ScopedFastNativeObjectAccess soa(env);
+  ScopedObjectAccess soa(env);
   Runtime::Current()->GetRuntimeCallbacks()->SetWaitingForDebugger(waiting);
 }
 
 static void VMDebug_setUserId(JNIEnv* env, jclass, jint user_id) {
-  ScopedFastNativeObjectAccess soa(env);
+  ScopedObjectAccess soa(env);
   Runtime::Current()->GetRuntimeCallbacks()->SetUserId(user_id);
 }