Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sentry-android-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ android {
lint {
warningsAsErrors = true
checkDependencies = true
// TODO(JAVA-547): Re-enable once the SDK_INT checks made obsolete by minSdk 26 are removed.
disable += "ObsoleteSdkInt"

// We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
checkReleaseBuilds = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import static io.sentry.IConnectionStatusProvider.ConnectionStatus.DISCONNECTED;
import static java.util.concurrent.TimeUnit.SECONDS;

import android.os.Build;
import io.sentry.CompositePerformanceCollector;
import io.sentry.DataCategory;
import io.sentry.IContinuousProfiler;
Expand Down Expand Up @@ -174,10 +173,6 @@ private void initScopes() {
private void start() {
initScopes();

// Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler
// causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392
if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return;

// Let's initialize trace folder and profiling interval
init();
// init() didn't create profiler, should never happen
Expand Down Expand Up @@ -279,12 +274,6 @@ private void stop(final boolean restartProfiler) {
return;
}

// onTransactionStart() is only available since Lollipop_MR1
// and SystemClock.elapsedRealtimeNanos() since Jelly Bean
if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) {
return;
}

List<PerformanceCollectionData> performanceCollectionData = null;
if (performanceCollector != null) {
performanceCollectionData = performanceCollector.stop(chunkId.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,6 @@ static void initializeIntegrationsAndProcessors(
if (options.getTransportGate() instanceof NoOpTransportGate) {
options.setTransportGate(new AndroidTransportGate(options));
}
// API 25 and lower may lack ISRG Root X1 (Let's Encrypt), so the SDK's own envelope uploads to
// Sentry SaaS trust the bundled root in addition to the system ones. Self-hosted DSNs keep the
// platform default, so Network Security Config domain-config trust anchors still apply there.
if (buildInfoProvider.getSdkInfoVersion() <= Build.VERSION_CODES.N_MR1
&& options.getSslSocketFactory() == null
&& SentryRootCaSslSocketFactory.isSentrySaasDsn(options.getDsn())) {
options.setSslSocketFactory(new SentryRootCaSslSocketFactory(options.getLogger()));
}

final @NotNull AppStartMetrics appStartMetrics = AppStartMetrics.getInstance();
options.setAppStartExtender(appStartMetrics.getAppStartExtension());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ private void init() {

@Override
public void start() {
// Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler
// causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392
if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return;

// When the first transaction is starting, we can start profiling
if (!isRunning.getAndSet(true)) {
// Let's initialize trace folder and profiling interval
Expand Down Expand Up @@ -234,11 +230,6 @@ public void bindTransaction(final @NotNull ITransaction transaction) {
final @Nullable List<PerformanceCollectionData> performanceCollectionData,
final @NotNull SentryOptions options) {

// onTransactionStart() is only available since Lollipop_MR1
// and SystemClock.elapsedRealtimeNanos() since Jelly Bean
// and SUPPORTED_ABIS since KITKAT
if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return null;

// check if profiler was created
if (profiler == null) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ public void register(final @NotNull IScopes scopes, final @NotNull SentryOptions

if (androidOptions.isEnableNetworkEventBreadcrumbs()) {

// The specific error is logged in the ConnectivityChecker method
if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.N) {
options.getLogger().log(SentryLevel.DEBUG, "NetworkCallbacks need Android N+.");
return;
}

try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
networkCallback =
new NetworkBreadcrumbsNetworkCallback(
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading