Skip to content

fix: potential fix for crash in Samsung Devices #792

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

Closed
wants to merge 2 commits into from
Closed

fix: potential fix for crash in Samsung Devices #792

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
6e98c71
fix: potential fix for crash in Samsung Devices
kikoso Nov 4, 2025
1a82ae7
fix: fixing dispatcher issue
kikoso Nov 5, 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
3 changes: 3 additions & 0 deletions maps-app/src/test/java/com/google/maps/android/compose/internal/GoogleMapsInitializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.verify
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.launch
import kotlinx.coroutines.test.TestDispatcher
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.setMain
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
Expand All @@ -51,6 +53,7 @@ class GoogleMapsInitializerTest {
every { MapsApiSettings.addInternalUsageAttributionId(any(), any()) } returns Unit

testDispatcher = UnconfinedTestDispatcher()
Dispatchers.setMain(testDispatcher)
googleMapsInitializer = DefaultGoogleMapsInitializer(testDispatcher)
}

Expand Down
6 changes: 4 additions & 2 deletions maps-compose/src/main/java/com/google/maps/android/compose/internal/GoogleMapsInitializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,11 @@ public class DefaultGoogleMapsInitializer(
_state.value = InitializationState.INITIALIZING
}

withContext(ioDispatcher) {
withContext(Dispatchers.Main) {
if (MapsInitializer.initialize(context) == ConnectionResult.SUCCESS) {
MapsApiSettings.addInternalUsageAttributionId(context, attributionId)
withContext(ioDispatcher) {
MapsApiSettings.addInternalUsageAttributionId(context, attributionId)
}
_state.value = InitializationState.SUCCESS
} else {
_state.value = InitializationState.FAILURE
Expand Down
Loading