fix(android): Resolve NullAway findings in sentry-android-core

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

@@ -176,7 +176,7 @@ private void stopPreviousTransactions() {
   }
 
   private void startTracing(final @NotNull Activity activity) {
-    if (scopes != null && !isRunningTransactionOrTrace(activity)) {
+    if (scopes != null && options != null && !isRunningTransactionOrTrace(activity)) {
       if (!performanceEnabled) {
         activitiesWithOngoingTransactions.put(activity, NoOpTransaction.getInstance());
         if (options.isEnableAutoTraceIdGeneration()) {
@@ -282,7 +282,7 @@ private void startTracing(final @NotNull Activity activity) {
         // Continue either the foreground app.start above or an earlier headless app.start.
         final @Nullable String continueSentryTrace;
         final @Nullable String continueBaggage;
-        if (createStandaloneAppStart) {
+        if (createStandaloneAppStart && appStartTransaction != null) {
           continueSentryTrace = appStartTransaction.toSentryTrace().getValue();
           final @Nullable BaggageHeader baggageHeader = appStartTransaction.toBaggageHeader(null);
           continueBaggage = baggageHeader == null ? null : baggageHeader.getValue();
@@ -332,7 +332,7 @@ private void startTracing(final @NotNull Activity activity) {
         final SpanOptions spanOptions = new SpanOptions();
         setSpanOrigin(spanOptions);
 
-        if (isAppStart) {
+        if (isAppStart && coldStart != null) {
           if (!createStandaloneAppStart && !options.isEnableStandaloneAppStartTracing()) {
             appStartSpan =
                 transaction.startChild(
@@ -980,7 +980,7 @@ private void onHeadlessAppStart() {
     }
 
     final @NotNull ITransaction transaction =
-        createStandaloneAppStartTransaction(startTime, null, false);
+        createStandaloneAppStartTransaction(scopes, options, startTime, null, false);
     transaction.finish(SpanStatus.OK, endTime);
   }
 
@@ -991,6 +991,8 @@ private void onHeadlessAppStart() {
    * for its children and gets a deadline so it stays open until the extended span finishes.
    */
   private @NotNull ITransaction createStandaloneAppStartTransaction(
+      final @NotNull IScopes scopes,
+      final @NotNull SentryAndroidOptions options,
       final @NotNull SentryDate startTime,
       final @Nullable TracesSamplingDecision samplingDecision,
       final boolean holdOpenForExtension) {
@@ -1069,7 +1071,7 @@ private void onHeadlessAppStart() {
     metrics.setAppStartSamplingDecision(null);
 
     final @NotNull ITransaction transaction =
-        createStandaloneAppStartTransaction(startTime, samplingDecision, true);
+        createStandaloneAppStartTransaction(scopes, options, startTime, samplingDecision, true);
 
     final SpanOptions spanOptions = new SpanOptions();
     setSpanOrigin(spanOptions);

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

@@ -25,7 +25,7 @@
 public final class AppState implements Closeable {
   private static @NotNull AppState instance = new AppState();
   private final @NotNull AutoClosableReentrantLock lock = new AutoClosableReentrantLock();
-  private volatile LifecycleObserver lifecycleObserver;
+  private volatile @Nullable LifecycleObserver lifecycleObserver;
   private MainLooperHandler handler = new MainLooperHandler();
 
   private AppState() {}
@@ -49,7 +49,7 @@ public void resetInstance() {
 
   @ApiStatus.Internal
   @TestOnly
-  public LifecycleObserver getLifecycleObserver() {
+  public @Nullable LifecycleObserver getLifecycleObserver() {
     return lifecycleObserver;
   }
 

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

@@ -18,7 +18,6 @@
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.User;
 import io.sentry.util.HintUtils;
-import io.sentry.util.LazyEvaluator;
 import io.sentry.util.Objects;
 import java.util.Collections;
 import java.util.List;
@@ -40,8 +39,7 @@ final class DefaultAndroidEventProcessor implements SentryEventProcessor {
   private final @NotNull BuildInfoProvider buildInfoProvider;
   private final @NotNull SentryAndroidOptions options;
   @TestOnly final @Nullable Future<DeviceInfoUtil> deviceInfoUtil;
-  private final @NotNull LazyEvaluator<String> deviceFamily =
-      new LazyEvaluator<>(() -> ContextUtils.getFamily(NoOpLogger.getInstance()));
+  private final @Nullable String deviceFamily = ContextUtils.getFamily(NoOpLogger.getInstance());
 
   public DefaultAndroidEventProcessor(
       final @NotNull Context context,
@@ -241,7 +239,7 @@ private void setDevice(final @NotNull SentryLogEvent event) {
           new SentryLogEventAttributeValue(SentryAttributeType.STRING, Build.MODEL));
       event.setAttribute(
           "device.family",
-          new SentryLogEventAttributeValue(SentryAttributeType.STRING, deviceFamily.getValue()));
+          new SentryLogEventAttributeValue(SentryAttributeType.STRING, deviceFamily));
     } catch (Throwable e) {
       options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve device info", e);
     }
@@ -269,7 +267,7 @@ private void setDevice(final @NotNull SentryMetricsEvent event) {
           new SentryLogEventAttributeValue(SentryAttributeType.STRING, Build.MODEL));
       event.setAttribute(
           "device.family",
-          new SentryLogEventAttributeValue(SentryAttributeType.STRING, deviceFamily.getValue()));
+          new SentryLogEventAttributeValue(SentryAttributeType.STRING, deviceFamily));
     } catch (Throwable e) {
       options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve device info", e);
     }

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

@@ -274,6 +274,7 @@ private void startShakeDetection(final @NotNull Activity activity) {
           final @Nullable WeakReference<Activity> ref = currentActivityRef;
           final Activity active = ref != null ? ref.get() : null;
           final Boolean inBackground = AppState.getInstance().isInBackground();
+          final @Nullable SentryAndroidOptions options = this.options;
           if (active == null
               || options == null
               || !enabled

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

@@ -66,8 +66,8 @@ public final class SystemEventsBreadcrumbsIntegration
   private final @NotNull String[] actions;
   private volatile boolean isClosed = false;
   private volatile boolean isStopped = false;
-  private volatile IntentFilter filter = null;
-  private volatile HandlerThread handlerThread = null;
+  private volatile @Nullable IntentFilter filter = null;
+  private volatile @Nullable HandlerThread handlerThread = null;
   private final @NotNull AtomicBoolean isReceiverRegistered = new AtomicBoolean(false);
   private final @NotNull AutoClosableReentrantLock receiverLock = new AutoClosableReentrantLock();
   // Track previous battery state to avoid duplicate breadcrumbs when values haven't changed
@@ -152,12 +152,6 @@ private void registerReceiver(
                       filter.addAction(item);
                     }
                   }
-                  if (customHandler == null && handlerThread == null) {
-                    handlerThread =
-                        new HandlerThread(
-                            "SystemEventsReceiver", Process.THREAD_PRIORITY_BACKGROUND);
-                    handlerThread.start();
-                  }
                   try {
                     // registerReceiver can throw SecurityException but it's not documented in the
                     // official docs
@@ -167,6 +161,12 @@ private void registerReceiver(
                     if (customHandler != null) {
                       handler = customHandler;
                     } else {
+                      if (handlerThread == null) {
+                        handlerThread =
+                            new HandlerThread(
+                                "SystemEventsReceiver", Process.THREAD_PRIORITY_BACKGROUND);
+                        handlerThread.start();
+                      }
                       handler = new Handler(handlerThread.getLooper());
                     }
                     ContextUtils.registerReceiver(context, options, receiver, filter, handler);
@@ -198,6 +198,7 @@ private void registerReceiver(
 
   @SuppressWarnings("Convert2MethodRef") // older AGP versions do not support method references
   private void scheduleUnregisterReceiver() {
+    final @Nullable SentryAndroidOptions options = this.options;
     if (options == null) {
       return;
     }

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

@@ -125,7 +125,7 @@ public ViewHierarchyEventProcessor(final @NotNull SentryAndroidOptions options)
     return event;
   }
 
-  public static byte[] snapshotViewHierarchyAsData(
+  public static @Nullable byte[] snapshotViewHierarchyAsData(
       @Nullable Activity activity,
       @NotNull IThreadChecker threadChecker,
       @NotNull ISerializer serializer,

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileManager.java

@@ -61,7 +61,7 @@ public AnrProfileManager(final @NotNull SentryOptions options, final @NotNull Fi
               queueFile,
               new ObjectQueue.Converter<AnrStackTrace>() {
                 @Override
-                public AnrStackTrace from(final byte[] source) throws IOException {
+                public @Nullable AnrStackTrace from(final byte[] source) throws IOException {
                   // no need to close the streams since they are backed by byte arrays and don't
                   // hold any resources
                   final @NotNull ByteArrayInputStream bis = new ByteArrayInputStream(source);

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/AndroidViewGestureTargetLocator.java

@@ -40,7 +40,7 @@ && isViewScrollable(view, isAndroidXAvailable.getValue())) {
     return null;
   }
 
-  private UiElement createUiElement(final @NotNull View targetView) {
+  private @Nullable UiElement createUiElement(final @NotNull View targetView) {
     final @Nullable String resourceName = ViewUtils.getResourceIdOrNull(targetView);
     if (resourceName == null) {
       return null;

sentry-android-core/src/main/java/io/sentry/android/core/internal/threaddump/ThreadDumpParser.java

@@ -178,7 +178,7 @@ public void parse(final @NotNull Lines lines) {
     markThreads();
   }
 
-  private SentryThread parseThread(final @NotNull Lines lines) {
+  private @Nullable SentryThread parseThread(final @NotNull Lines lines) {
     final SentryThread sentryThread = new SentryThread();
 
     final Matcher beginManagedThreadRe = BEGIN_MANAGED_THREAD_RE.matcher("");

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/TombstoneParser.java

@@ -316,6 +316,7 @@ void extendTo(final @NotNull MemoryMapping mapping) {
       this.previousOffset = mapping.offset;
     }
 
+    @Nullable
     DebugImage toDebugImage() {
       if (buildId.isEmpty()) {
         return null;

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

@@ -311,16 +311,16 @@ private void updateCacheAndNotifyObservers(
             private boolean isSignificantChange(@Nullable NetworkCapabilities newCapabilities) {
               final NetworkCapabilities oldCapabilities = cachedNetworkCapabilities;
 
-              // Always significant if transitioning between null and non-null
-              if ((oldCapabilities == null) != (newCapabilities == null)) {
-                return true;
-              }
-
               // If both null, no change
               if (oldCapabilities == null && newCapabilities == null) {
                 return false;
               }
 
+              // Always significant if transitioning between null and non-null
+              if (oldCapabilities == null || newCapabilities == null) {
+                return true;
+              }
+
               // Check significant capability changes
               if (hasSignificantCapabilityChanges(oldCapabilities, newCapabilities)) {
                 return true;

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

@@ -110,14 +110,14 @@ class AndroidLoggerBatchProcessorTest {
     val sut = fixture.getSut()
     sut.close(false)
 
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
   }
 
   @Test
   fun `close with isRestarting true still removes listener`() {
     val sut = fixture.getSut()
     sut.close(true)
 
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
   }
 }

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

@@ -109,14 +109,14 @@ class AndroidMetricsBatchProcessorTest {
     val sut = fixture.getSut()
     sut.close(false)
 
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
   }
 
   @Test
   fun `close with isRestarting true still removes listener`() {
     val sut = fixture.getSut()
     sut.close(true)
 
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
   }
 }

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

@@ -118,7 +118,7 @@ class SessionTrackingIntegrationTest {
 
   private fun setupLifecycle(): LifecycleRegistry {
     val lifecycle = LifecycleRegistry(ProcessLifecycleOwner.get())
-    lifecycle.addObserver(AppState.getInstance().lifecycleObserver)
+    lifecycle.addObserver(AppState.getInstance().lifecycleObserver!!)
     return lifecycle
   }
 

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

@@ -387,7 +387,7 @@ class SystemEventsBreadcrumbsIntegrationTest {
     sut.register(fixture.scopes, fixture.options)
 
     assertTrue(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )
@@ -401,7 +401,7 @@ class SystemEventsBreadcrumbsIntegrationTest {
     sut.register(fixture.scopes, fixture.options)
 
     assertFalse(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )
@@ -414,15 +414,15 @@ class SystemEventsBreadcrumbsIntegrationTest {
     sut.register(fixture.scopes, fixture.options)
 
     assertTrue(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )
 
     sut.close()
 
     assertFalse(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )
@@ -447,7 +447,7 @@ class SystemEventsBreadcrumbsIntegrationTest {
     shadowOf(Looper.getMainLooper()).idle()
 
     assertFalse(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )

sentry-android-core/src/test/java/io/sentry/android/core/anr/AnrProfilingIntegrationTest.kt

@@ -94,15 +94,15 @@ class AnrProfilingIntegrationTest {
     val thread = integration.getProperty<Thread?>("thread")
     assertNotNull(thread)
 
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isNotEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isNotEmpty())
 
     integration.close()
     thread.join(2000)
 
     assertTrue(!thread.isAlive)
     val enabled = integration.getProperty<java.util.concurrent.atomic.AtomicBoolean>("enabled")
     assertTrue(!enabled.get())
-    assertTrue(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertTrue(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
   }
 
   @Test
@@ -334,7 +334,7 @@ class AnrProfilingIntegrationTest {
     val integration = AnrProfilingIntegration()
     integration.register(mockScopes, androidOptions)
 
-    assertFalse(AppState.getInstance().lifecycleObserver.listeners.isEmpty())
+    assertFalse(AppState.getInstance().lifecycleObserver!!.listeners.isEmpty())
     assertTrue(SentryIntegrationPackageStorage.getInstance().integrations.contains("AnrProfiling"))
 
     integration.close()

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProviderTest.kt

@@ -792,7 +792,7 @@ class AndroidConnectionStatusProviderTest {
     connectionStatusProvider.onBackground()
 
     assertFalse(
-      AppState.getInstance().lifecycleObserver.listeners.any {
+      AppState.getInstance().lifecycleObserver!!.listeners.any {
         it is SystemEventsBreadcrumbsIntegration
       }
     )

sentry/src/main/java/io/sentry/internal/gestures/UiElement.java

@@ -51,7 +51,7 @@ public UiElement(
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(final @Nullable Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     UiElement uiElement = (UiElement) o;

sentry/src/main/java/io/sentry/protocol/ViewHierarchyNode.java

@@ -49,7 +49,7 @@ public void setRenderingSystem(String renderingSystem) {
     this.renderingSystem = renderingSystem;
   }
 
-  public void setType(String type) {
+  public void setType(final @Nullable String type) {
     this.type = type;
   }