Skip to content

Commit 37db50e

Browse files
authored
🤖 Merge PR #58711 Sync frida-gum typings with Frida 15.1.17 by @oleavr
1 parent 6465158 commit 37db50e

2 files changed

Lines changed: 23 additions & 28 deletions

File tree

types/frida-gum/frida-gum-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ Java.perform(() => {
265265
});
266266
});
267267

268-
// $ExpectType Frame[]
268+
// $ExpectType Backtrace
269269
Java.backtrace();
270-
// $ExpectType Frame[]
270+
// $ExpectType Backtrace
271271
Java.backtrace({ limit: 42 });
272272
});

types/frida-gum/index.d.ts

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for non-npm package frida-gum 17.3
1+
// Type definitions for non-npm package frida-gum 18.0
22
// Project: https://github.com/frida/frida
33
// Definitions by: Ole André Vadla Ravnås <https://github.com/oleavr>
44
// Francesco Tamagni <https://github.com/mrmacete>
@@ -4513,11 +4513,9 @@ declare namespace Java {
45134513
/**
45144514
* Generates a backtrace for the current thread.
45154515
*
4516-
* Note that this API is unstable and subject to change.
4517-
*
45184516
* @param options Options to customize the stack-walking.
45194517
*/
4520-
function backtrace(options?: BacktraceOptions): Frame[];
4518+
function backtrace(options?: BacktraceOptions): Backtrace;
45214519

45224520
/**
45234521
* Determines whether the caller is running on the main thread.
@@ -4644,39 +4642,36 @@ declare namespace Java {
46444642
}
46454643

46464644
/**
4647-
* Stack frame returned by `Java.backtrace()`.
4645+
* Backtrace returned by `Java.backtrace()`.
46484646
*/
4649-
interface Frame {
4647+
interface Backtrace {
46504648
/**
4651-
* Method being called.
4649+
* ID that can be used for deduplicating identical backtraces.
46524650
*/
4653-
method: {
4654-
/**
4655-
* The jmethodID of the method. On ART, this is an `ArtMethod *`.
4656-
*/
4657-
handle: NativePointer;
4651+
id: string;
46584652

4659-
/**
4660-
* Method name, e.g. `"loopOnce"`.
4661-
*/
4662-
name: string;
4663-
4664-
/**
4665-
* Return type, e.g. `"boolean"`.
4666-
*/
4667-
returnType: string;
4653+
/**
4654+
* Stack frames.
4655+
*/
4656+
frames: Frame[];
4657+
}
46684658

4669-
/**
4670-
* Argument types, e.g. `["android.os.Looper", "long", "int"]`.
4671-
*/
4672-
argumentTypes: string[];
4673-
};
4659+
interface Frame {
4660+
/**
4661+
* Signature, e.g. `"Landroid/os/Looper;,loopOnce,(Landroid/os/Looper;JI)Z"`.
4662+
*/
4663+
signature: string;
46744664

46754665
/**
46764666
* Class name that method belongs to, e.g. `"android.os.Looper"`.
46774667
*/
46784668
className: string;
46794669

4670+
/**
4671+
* Method name, e.g. `"loopOnce"`.
4672+
*/
4673+
methodName: string;
4674+
46804675
/**
46814676
* Source file name, e.g. `"Looper.java"`.
46824677
*/

0 commit comments

Comments
 (0)