Skip to content

Commit 814ad79

Browse files
authored
Merge pull request #1656 from DataDog/nogorodnikov/agp_8.1.1
Update AGP to 8.1.1
2 parents d3a3f83 + b163bd6 commit 814ad79

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/receiver/ThreadSafeReceiver.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,28 @@
66

77
package com.datadog.android.core.internal.receiver
88

9+
import android.annotation.SuppressLint
910
import android.content.BroadcastReceiver
1011
import android.content.Context
1112
import android.content.Intent
1213
import android.content.IntentFilter
14+
import android.os.Build
1315
import java.util.concurrent.atomic.AtomicBoolean
1416

1517
internal abstract class ThreadSafeReceiver : BroadcastReceiver() {
1618

1719
val isRegistered = AtomicBoolean(false)
1820

21+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
1922
fun registerReceiver(
2023
context: Context,
2124
filter: IntentFilter
2225
): Intent? {
23-
val intent = context.registerReceiver(this, filter)
26+
val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
27+
context.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED)
28+
} else {
29+
context.registerReceiver(this, filter)
30+
}
2431
isRegistered.set(true)
2532
return intent
2633
}

detekt_custom.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ datadog:
286286
- "android.content.Context.getSystemService(kotlin.String)"
287287
- "android.content.Context.registerComponentCallbacks(android.content.ComponentCallbacks)"
288288
- "android.content.Context.registerReceiver(android.content.BroadcastReceiver?, android.content.IntentFilter)"
289+
- "android.content.Context.registerReceiver(android.content.BroadcastReceiver?, android.content.IntentFilter, kotlin.Int)"
289290
- "android.content.Context.unregisterReceiver(android.content.BroadcastReceiver)"
290291
- "android.content.Intent.getBooleanExtra(kotlin.String, kotlin.Boolean)"
291292
- "android.content.Intent.getIntExtra(kotlin.String, kotlin.Int)"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ okHttp = "4.11.0"
77
kronosNTP = "0.0.1-alpha11"
88

99
# Android
10-
androidToolsPlugin = "8.0.2"
10+
androidToolsPlugin = "8.1.1"
1111
androidXAnnotations = "1.1.0"
1212
androidXAppCompat = "1.3.0"
1313
androidXCore = "1.3.1"

0 commit comments

Comments
 (0)