Skip to content

Removing permission from manifest #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

Removing permission from manifest #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e5b6f3
Removing permission from manifest
LikeTheSalad Oct 7, 2025
7f667c6
Annotating permissions
LikeTheSalad Oct 7, 2025
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
1 change: 0 additions & 1 deletion agent-sdk/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<application>
Expand Down
3 changes: 3 additions & 0 deletions .../java/co/elastic/otel/android/internal/services/network/query/NetworkApi21QueryManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package co.elastic.otel.android.internal.services.network.query

import android.Manifest
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import android.telephony.TelephonyManager
import androidx.annotation.GuardedBy
import androidx.annotation.RequiresPermission
import co.elastic.otel.android.internal.services.network.listener.NetworkChangeListener

/**
Expand All @@ -45,6 +47,7 @@ internal class NetworkApi21QueryManager(
this.listener = listener
}

@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
override fun getNetworkType(): Int {
return telephonyManager.networkType
}
Expand Down
3 changes: 3 additions & 0 deletions .../java/co/elastic/otel/android/internal/services/network/query/NetworkApi23QueryManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package co.elastic.otel.android.internal.services.network.query

import android.Manifest
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
Expand All @@ -27,6 +28,7 @@ import android.os.Build
import android.telephony.TelephonyManager
import androidx.annotation.GuardedBy
import androidx.annotation.RequiresApi
import androidx.annotation.RequiresPermission
import co.elastic.otel.android.internal.services.network.listener.NetworkChangeListener

/**
Expand All @@ -48,6 +50,7 @@ internal class NetworkApi23QueryManager(
this.listener = listener
}

@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
override fun getNetworkType(): Int {
return telephonyManager.networkType
}
Expand Down
3 changes: 3 additions & 0 deletions .../java/co/elastic/otel/android/internal/services/network/query/NetworkApi24QueryManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package co.elastic.otel.android.internal.services.network.query

import android.Manifest
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkCapabilities
import android.os.Build
import android.telephony.TelephonyManager
import androidx.annotation.RequiresApi
import androidx.annotation.RequiresPermission
import co.elastic.otel.android.internal.services.network.listener.NetworkChangeListener

/**
Expand All @@ -42,6 +44,7 @@ internal class NetworkApi24QueryManager(
this.listener = listener
}

@RequiresPermission(anyOf = [Manifest.permission.READ_BASIC_PHONE_STATE, Manifest.permission.READ_PHONE_STATE])
override fun getNetworkType(): Int {
return telephonyManager.dataNetworkType
}
Expand Down