forked from Expensify/App
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: 1777d7e Merge pull request Expensify#43140 from Expensify/cmarti…
…ns-fixButtonWidthDisableTaxSorting
- Loading branch information
Showing
69 changed files
with
1,503 additions
and
617 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| diff --git a/node_modules/@perf-profiler/android/dist/src/commands.js b/node_modules/@perf-profiler/android/dist/src/commands.js | ||
| old mode 100755 | ||
| new mode 100644 | ||
| diff --git a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
| index 77b9ee0..59aeed9 100644 | ||
| --- a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
| +++ b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
| @@ -134,7 +134,20 @@ class UnixProfiler { | ||
| } | ||
| const subProcessesStats = (0, getCpuStatsByProcess_1.processOutput)(cpu, pid); | ||
| const ram = (0, pollRamUsage_1.processOutput)(ramStr, this.getRAMPageSize()); | ||
| - const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); | ||
| + | ||
| + let output; | ||
| + try { | ||
| + output = frameTimeParser.getFrameTimes(atrace, pid); | ||
| + } catch (e) { | ||
| + console.error(e); | ||
| + } | ||
| + | ||
| + if (!output) { | ||
| + return; | ||
| + } | ||
| + | ||
| + const { frameTimes, interval: atraceInterval } = output; | ||
| + | ||
| if (!initialTime) { | ||
| initialTime = timestamp; | ||
| } | ||
| diff --git a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
| index d6983c1..ccacf09 100644 | ||
| --- a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
| +++ b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
| @@ -136,7 +136,19 @@ export abstract class UnixProfiler implements Profiler { | ||
| const subProcessesStats = processOutput(cpu, pid); | ||
|
|
||
| const ram = processRamOutput(ramStr, this.getRAMPageSize()); | ||
| - const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); | ||
| + | ||
| + let output; | ||
| + try { | ||
| + output = frameTimeParser.getFrameTimes(atrace, pid); | ||
| + } catch (e) { | ||
| + console.error(e); | ||
| + } | ||
| + | ||
| + if (!output) { | ||
| + return; | ||
| + } | ||
| + | ||
| + const { frameTimes, interval: atraceInterval } = output; | ||
|
|
||
| if (!initialTime) { | ||
| initialTime = timestamp; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
| index 2f84d84..14ae688 100644 | ||
| --- a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
| +++ b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
| @@ -4,4 +4,6 @@ export * from "./reporting/Report"; | ||
| export * from "./utils/sanitizeProcessName"; | ||
| export * from "./utils/round"; | ||
| export * from "./reporting/cpu"; | ||
| +export * from "./reporting/ram"; | ||
| +export * from "./reporting/fps"; | ||
| export { canComputeHighCpuUsage } from "./reporting/highCpu"; | ||
| diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.js b/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
| index 4b50e3a..780963a 100644 | ||
| --- a/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
| +++ b/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
| @@ -21,6 +21,8 @@ __exportStar(require("./reporting/Report"), exports); | ||
| __exportStar(require("./utils/sanitizeProcessName"), exports); | ||
| __exportStar(require("./utils/round"), exports); | ||
| __exportStar(require("./reporting/cpu"), exports); | ||
| +__exportStar(require("./reporting/fps"), exports); | ||
| +__exportStar(require("./reporting/ram"), exports); | ||
| var highCpu_1 = require("./reporting/highCpu"); | ||
| Object.defineProperty(exports, "canComputeHighCpuUsage", { enumerable: true, get: function () { return highCpu_1.canComputeHighCpuUsage; } }); | ||
| //# sourceMappingURL=index.js.map | ||
| \ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.