Skip to content

Add carrier information in case of WiFi connection with SIM card. #1465

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

Open
Hemant21KG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add carrier information in case of WiFi connection with SIM card. #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...n/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ internal class NetworkDetectorImpl(
/**
* Builds a network for non-cellular networks.
*/
private fun buildNetwork(networkState: NetworkState) = CurrentNetwork(networkState)
private fun buildNetwork(networkState: NetworkState): CurrentNetwork {
val carrier = carrierFinder.get()
return CurrentNetwork(
state = networkState,
carrier = carrier,
)
}

/**
* Builds a cellular network with carrier and subtype information.
Expand Down
16 changes: 15 additions & 1 deletion ...t/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ class NetworkDetectorTest {
every { connectivityManager.getNetworkCapabilities(network) } returns networkCapabilities
every { networkCapabilities.hasTransport(any()) } returns false // default
every { telephonyManager.simOperatorName } returns "JibroCom" // default
every { telephonyManager.simOperator } returns "JibroComSimOperator" // default
every { telephonyManager.simCountryIso } returns "JibroComSimCountryIso" // default

// Mock telephony feature as available by default
every { packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) } returns true
Expand Down Expand Up @@ -106,7 +108,19 @@ class NetworkDetectorTest {
every { networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) } returns true
val networkDetector = NetworkDetector.create(context)
val currentNetwork = networkDetector.detectCurrentNetwork()
assertThat(currentNetwork).isEqualTo(CurrentNetwork(NetworkState.TRANSPORT_WIFI))
assertThat(currentNetwork).isEqualTo(
CurrentNetwork(
NetworkState.TRANSPORT_WIFI,
carrier =
Carrier(
-1,
name = "JibroCom",
mobileCountryCode = "Jib",
mobileNetworkCode = "roComSimOperator",
isoCountryCode = "JibroComSimCountryIso",
),
),
)
}

@Test
Expand Down