Skip to content

Commit 2d05bb1

Browse files
build(deps): bump github/codeql-action from 4.31.10 to 4.31.11 (#5057)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.10 to 4.31.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@cdefb33...19b2f06) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent a19335c commit 2d05bb1

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
39+
uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
48+
uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/CpuInfoUtils.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,16 @@ String getSystemCpuPath() {
7575

7676
@TestOnly
7777
public void setCpuMaxFrequencies(List<Integer> frequencies) {
78-
cpuMaxFrequenciesMhz.clear();
79-
cpuMaxFrequenciesMhz.addAll(frequencies);
78+
try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
79+
cpuMaxFrequenciesMhz.clear();
80+
cpuMaxFrequenciesMhz.addAll(frequencies);
81+
}
8082
}
8183

8284
@TestOnly
83-
final void clear() {
84-
cpuMaxFrequenciesMhz.clear();
85+
public void clear() {
86+
try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
87+
cpuMaxFrequenciesMhz.clear();
88+
}
8589
}
8690
}

sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ class DefaultAndroidEventProcessorTest {
8787
context = ApplicationProvider.getApplicationContext()
8888
AppState.getInstance().resetInstance()
8989
DeviceInfoUtil.resetInstance()
90+
CpuInfoUtils.getInstance().clear()
9091
}
9192

9293
@Test

0 commit comments

Comments
 (0)