Merge branch 'main' into markushi/feat/restructure-sample-app

Author: markushi

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
+        uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
+        uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2

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

@@ -75,12 +75,16 @@ String getSystemCpuPath() {
 
   @TestOnly
   public void setCpuMaxFrequencies(List<Integer> frequencies) {
-    cpuMaxFrequenciesMhz.clear();
-    cpuMaxFrequenciesMhz.addAll(frequencies);
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      cpuMaxFrequenciesMhz.clear();
+      cpuMaxFrequenciesMhz.addAll(frequencies);
+    }
   }
 
   @TestOnly
-  final void clear() {
-    cpuMaxFrequenciesMhz.clear();
+  public void clear() {
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      cpuMaxFrequenciesMhz.clear();
+    }
   }
 }

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

@@ -87,6 +87,7 @@ class DefaultAndroidEventProcessorTest {
     context = ApplicationProvider.getApplicationContext()
     AppState.getInstance().resetInstance()
     DeviceInfoUtil.resetInstance()
+    CpuInfoUtils.getInstance().clear()
   }
 
   @Test