Merge dc395a6 into c7e2fbc

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Set export flag on Android receivers on API 33+ ([#2990](https://github.com/getsentry/sentry-java/pull/2990))
+
 ## 6.31.0
 
 ### Features

buildSrc/src/main/java/Config.kt

@@ -30,7 +30,7 @@ object Config {
     }
 
     object Android {
-        private val sdkVersion = 33
+        private val sdkVersion = 34
 
         val minSdkVersion = 14
         val minSdkVersionOkHttp = 21
@@ -181,10 +181,10 @@ object Config {
         val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
         val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
         val androidxTestOrchestrator = "androidx.test:orchestrator:1.4.2"
-        val androidxJunit = "androidx.test.ext:junit:1.1.3"
+        val androidxJunit = "androidx.test.ext:junit:1.1.5"
         val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
-        val robolectric = "org.robolectric:robolectric:4.7.3"
-        val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0"
+        val robolectric = "org.robolectric:robolectric:4.10.3"
+        val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
         val mockitoInline = "org.mockito:mockito-inline:4.8.0"
         val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
         val mockWebserver = "com.squareup.okhttp3:mockwebserver:${Libs.okHttpVersion}"

sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java

@@ -2,11 +2,15 @@
 
 import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
 import static android.content.Context.ACTIVITY_SERVICE;
+import static android.content.Context.RECEIVER_NOT_EXPORTED;
 import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -16,6 +20,7 @@
 import android.util.DisplayMetrics;
 import io.sentry.ILogger;
 import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
 import io.sentry.protocol.App;
 import java.io.BufferedReader;
 import java.io.File;
@@ -346,6 +351,29 @@ static boolean isForegroundImportance(final @NotNull Context context) {
     }
   }
 
+  /** Register a not exported BroadcastReceiver, independently from platform version. */
+  static @Nullable Intent registerReceiver(
+      final @NotNull Context context,
+      final @NotNull SentryOptions options,
+      final @Nullable BroadcastReceiver receiver,
+      final @NotNull IntentFilter filter) {
+    return registerReceiver(context, new BuildInfoProvider(options.getLogger()), receiver, filter);
+  }
+
+  /** Register a not exported BroadcastReceiver, independently from platform version. */
+  @SuppressLint({"NewApi", "UnspecifiedRegisterReceiverFlag"})
+  static @Nullable Intent registerReceiver(
+      final @NotNull Context context,
+      final @NotNull BuildInfoProvider buildInfoProvider,
+      final @Nullable BroadcastReceiver receiver,
+      final @NotNull IntentFilter filter) {
+    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.TIRAMISU) {
+      return context.registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED);
+    } else {
+      return context.registerReceiver(receiver, filter);
+    }
+  }
+
   // we perform an if-check for that, but lint fails to recognize
   @SuppressLint("NewApi")
   static void setAppPackageInfo(

sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java

@@ -262,7 +262,8 @@ private Date getBootTime() {
 
   @Nullable
   private Intent getBatteryIntent() {
-    return context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+    return ContextUtils.registerReceiver(
+        context, buildInfoProvider, null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
   }
 
   /**

sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java

@@ -99,7 +99,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
       }
       try {
         // registerReceiver can throw SecurityException but it's not documented in the official docs
-        context.registerReceiver(receiver, filter);
+        ContextUtils.registerReceiver(context, options, receiver, filter);
         this.options
             .getLogger()
             .log(SentryLevel.DEBUG, "SystemEventsBreadcrumbsIntegration installed.");

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

@@ -2,15 +2,20 @@ package io.sentry.android.core
 
 import android.app.ActivityManager
 import android.app.ActivityManager.MemoryInfo
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.IntentFilter
+import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.ILogger
 import io.sentry.NoOpLogger
 import org.junit.runner.RunWith
 import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.robolectric.annotation.Config
 import org.robolectric.shadow.api.Shadow
@@ -161,4 +166,28 @@ class ContextUtilsUnitTests {
         val memInfo = ContextUtils.getMemInfo(mock(), logger)
         assertNull(memInfo)
     }
+
+    @Test
+    fun `registerReceiver calls context_registerReceiver without exported flag on API 32-`() {
+        val buildInfo = mock<BuildInfoProvider>()
+        val receiver = mock<BroadcastReceiver>()
+        val filter = mock<IntentFilter>()
+        val context = mock<Context>()
+        whenever(buildInfo.sdkInfoVersion).thenReturn(Build.VERSION_CODES.S)
+        ContextUtils.registerReceiver(context, buildInfo, receiver, filter)
+        verify(context).registerReceiver(eq(receiver), eq(filter))
+    }
+/*
+    context.registerReceiver(BroadcastReceiver, IntentFilter, int) throws with NoSuchMethod exception in tests
+    Re-enable this test when possible
+    @Test
+    fun `registerReceiver calls context_registerReceiver with exported flag on API 33+`() {
+        val buildInfo = mock<BuildInfoProvider>()
+        val receiver = mock<BroadcastReceiver>()
+        val filter = mock<IntentFilter>()
+        val context = mock<Context>()
+        whenever(buildInfo.sdkInfoVersion).thenReturn(Build.VERSION_CODES.TIRAMISU)
+        ContextUtils.registerReceiver(context, buildInfo, receiver, filter)
+        verify(context).registerReceiver(eq(receiver), eq(filter), eq(RECEIVER_NOT_EXPORTED))
+    }*/
 }

sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml

@@ -150,6 +150,6 @@
 
         <!--    how to disable sentry -->
         <!--    <meta-data android:name="io.sentry.enabled" android:value="false" /> -->
-      
+
     </application>
 </manifest>