frida-java-bridge 7.0.6 → 7.0.8

package/lib/android.js

@@ -312,6 +312,7 @@ function _getApi () {
 
           // Android >= 11
           _ZN3art3jni12JniIdManager14DecodeMethodIdEP10_jmethodID: ['art::jni::JniIdManager::DecodeMethodId', 'pointer', ['pointer', 'pointer']],
+          _ZN3art3jni12JniIdManager13DecodeFieldIdEP9_jfieldID: ['art::jni::JniIdManager::DecodeFieldId', 'pointer', ['pointer', 'pointer']],
           _ZN3art11interpreter18GetNterpEntryPointEv: ['art::interpreter::GetNterpEntryPoint', 'pointer', []],
 
           _ZN3art7Monitor17TranslateLocationEPNS_9ArtMethodEjPPKcPi: ['art::Monitor::TranslateLocation', 'void', ['pointer', 'uint32', 'pointer', 'pointer']]
@@ -370,6 +371,7 @@ function _getApi () {
           '_ZN3art3Dbg20ManageDeoptimizationEv',
           '_ZN3art3Dbg9gRegistryE',
           '_ZN3art3jni12JniIdManager14DecodeMethodIdEP10_jmethodID',
+          '_ZN3art3jni12JniIdManager13DecodeFieldIdEP9_jfieldID',
           '_ZN3art11interpreter18GetNterpEntryPointEv',
           '_ZN3art7Monitor17TranslateLocationEPNS_9ArtMethodEjPPKcPi'
         ])
@@ -967,14 +969,14 @@ export function getArtClassSpec (vm) {
     const fInfo = {
       artArrayLengthSize: 4,
       artArrayEntrySize: fieldSpec.size,
-      // java/io/File has 15 fields on Android 16.
-      artArrayMax: 25
+      // java/lang/Thread has 36 fields on Android 16.
+      artArrayMax: 50
     };
 
     const mInfo = {
       artArrayLengthSize: pointerSize,
       artArrayEntrySize: methodSpec.size,
-      // java/io/File has 63 methods on Android 16.
+      // java/lang/Thread has 79 methods on Android 16.
       artArrayMax: 100
     };
 
@@ -1015,7 +1017,7 @@ export function getArtClassSpec (vm) {
       return false;
     };
 
-    const clazz = env.findClass('java/io/File');
+    const clazz = env.findClass('java/lang/Thread');
     const clazzRef = env.newGlobalRef(clazz);
 
     try {
@@ -1024,8 +1026,8 @@ export function getArtClassSpec (vm) {
         object = getApi()['art::JavaVMExt::DecodeGlobal'](vm, thread, clazzRef);
       });
 
-      const fieldInstance = env.getFieldId(clazzRef, 'path', 'Ljava/lang/String;');
-      const fieldStatic = env.getStaticFieldId(clazzRef, 'separatorChar', 'C');
+      const fieldInstance = unwrapFieldId(env.getFieldId(clazzRef, 'name', 'Ljava/lang/String;'));
+      const fieldStatic = unwrapFieldId(env.getStaticFieldId(clazzRef, 'MAX_PRIORITY', 'I'));
 
       let offsetStatic = -1;
       let offsetInstance = -1;
@@ -1038,20 +1040,20 @@ export function getArtClassSpec (vm) {
         }
       }
       if (offsetInstance === -1 || offsetStatic === -1) {
-        throw new Error('Unable to find fields in java/io/File; please file a bug');
+        throw new Error('Unable to find fields in java/lang/Thread; please file a bug');
       }
       const sfieldOffset = (offsetInstance !== offsetStatic) ? offsetStatic : 0;
       const ifieldOffset = offsetInstance;
 
       let offsetMethods = -1;
-      const methodInstance = env.getMethodId(clazzRef, 'length', '()J');
+      const methodInstance = unwrapMethodId(env.getMethodId(clazzRef, 'getName', '()Ljava/lang/String;'));
       for (let offset = 0; offset !== MAX_OFFSET; offset += 4) {
         if (offsetMethods === -1 && hasEntry(object, offset, methodInstance, mInfo)) {
           offsetMethods = offset;
         }
       }
       if (offsetMethods === -1) {
-        throw new Error('Unable to find methods in java/io/File; please file a bug');
+        throw new Error('Unable to find methods in java/lang/Thread; please file a bug');
       }
 
       let offsetCopiedMethods = -1;
@@ -1064,7 +1066,7 @@ export function getArtClassSpec (vm) {
         }
       }
       if (offsetCopiedMethods === -1) {
-        throw new Error('Unable to find copied methods in java/io/File; please file a bug');
+        throw new Error('Unable to find copied methods in java/lang/Thread; please file a bug');
       }
 
       spec = {
@@ -2959,6 +2961,14 @@ export function revertGlobalPatches () {
 }
 
 function unwrapMethodId (methodId) {
+  return unwrapGenericId(methodId, 'art::jni::JniIdManager::DecodeMethodId');
+}
+
+function unwrapFieldId (fieldId) {
+  return unwrapGenericId(fieldId, 'art::jni::JniIdManager::DecodeFieldId');
+}
+
+function unwrapGenericId (genericId, apiMethod) {
   const api = getApi();
 
   const runtimeOffset = getArtRuntimeSpec(api).offset;
@@ -2972,11 +2982,11 @@ function unwrapMethodId (methodId) {
 
     if (jniIdsIndirection !== kPointer) {
       const jniIdManager = runtime.add(jniIdManagerOffset).readPointer();
-      return api['art::jni::JniIdManager::DecodeMethodId'](jniIdManager, methodId);
+      return api[apiMethod](jniIdManager, genericId);
     }
   }
 
-  return methodId;
+  return genericId;
 }
 
 const artQuickCodeReplacementTrampolineWriters = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-java-bridge",
-  "version": "7.0.6",
+  "version": "7.0.8",
   "description": "Java runtime interop from Frida",
   "keywords": [
     "frida-gum",