mark androidauto classes with UiThread annotation

dzinad · dzinad · commit 0ab25f7c0a89 · 2022-09-23T20:38:06.000+03:00
diff --git a/libnavui-androidauto/CHANGELOG.md b/libnavui-androidauto/CHANGELOG.md
@@ -7,6 +7,7 @@ Mapbox welcomes participation and contributions from everyone.
 #### Bug fixes and improvements
 - Use `MapboxAudioGuidance` from public api. [#6336](https://github.com/mapbox/mapbox-navigation-android/pull/6336)
 - Fixed an issue that caused camera animations to interfere with user gestures. [#6357](https://github.com/mapbox/mapbox-navigation-android/pull/6357)
+- Marked `CarFeedbackSender`, `CarGridFeedbackScreen`, `CarLocationsOverviewCamera`, `CarNavigationCamera`, `PlacesListItemClickListener`, `PlacesListOnMapLayerUtil`, `PlacesListOnMapScreen`, `CarRoutePreviewScreen`, `CarRouteRequest`, `PlaceSearchScreen`, `MainCarScreen`, `AppAudioGuidanceUtil`, `MapboxCarApp` methods with `@UiThread` annotation. [#6267](https://github.com/mapbox/mapbox-navigation-android/pull/6267)
 
 ## androidauto-v0.11.0 - Sep 16, 2022
 ### Changelog
diff --git a/libnavui-androidauto/api/current.txt b/libnavui-androidauto/api/current.txt
@@ -19,7 +19,7 @@ package com.mapbox.androidauto {
   public final class MapboxCarApp {
     method public com.mapbox.androidauto.navigation.location.CarAppLocation carAppLocationService();
     method public kotlinx.coroutines.flow.StateFlow<com.mapbox.androidauto.CarAppState> getCarAppState();
-    method public void setup();
+    method @UiThread public void setup();
     method public void updateCarAppState(com.mapbox.androidauto.CarAppState carAppState);
     property public final kotlinx.coroutines.flow.StateFlow<com.mapbox.androidauto.CarAppState> carAppState;
     field public static final com.mapbox.androidauto.MapboxCarApp INSTANCE;
@@ -74,7 +74,7 @@ package com.mapbox.androidauto.car {
   }
 
   public final class MainCarScreen extends androidx.car.app.Screen {
-    ctor public MainCarScreen(com.mapbox.androidauto.car.MainCarContext mainCarContext);
+    ctor @UiThread public MainCarScreen(com.mapbox.androidauto.car.MainCarContext mainCarContext);
     method public com.mapbox.androidauto.car.location.CarLocationRenderer getCarLocationRenderer();
     method public com.mapbox.androidauto.car.navigation.CarNavigationCamera getCarNavigationCamera();
     method public com.mapbox.androidauto.car.preview.CarRouteLine getCarRouteLine();
@@ -167,7 +167,7 @@ package com.mapbox.androidauto.car.feedback.core {
 
   public final class CarFeedbackSender {
     ctor public CarFeedbackSender();
-    method public void send(com.mapbox.androidauto.car.feedback.ui.CarFeedbackItem selectedItem, String? encodedSnapshot, String sourceScreenSimpleName);
+    method @UiThread public void send(com.mapbox.androidauto.car.feedback.ui.CarFeedbackItem selectedItem, String? encodedSnapshot, String sourceScreenSimpleName);
   }
 
 }
@@ -260,7 +260,7 @@ package com.mapbox.androidauto.car.feedback.ui {
   }
 
   public final class CarGridFeedbackScreen extends androidx.car.app.Screen {
-    ctor public CarGridFeedbackScreen(androidx.car.app.CarContext carContext, String sourceScreenSimpleName, com.mapbox.androidauto.car.feedback.core.CarFeedbackSender carFeedbackSender, com.mapbox.androidauto.car.feedback.ui.CarFeedbackPoll initialPoll, String? encodedSnapshot, com.mapbox.androidauto.car.feedback.core.CarFeedbackSearchOptions searchOptions = com.mapbox.androidauto.car.feedback.core.CarFeedbackSearchOptions(), kotlin.jvm.functions.Function0<kotlin.Unit> onFinish);
+    ctor @UiThread public CarGridFeedbackScreen(androidx.car.app.CarContext carContext, String sourceScreenSimpleName, com.mapbox.androidauto.car.feedback.core.CarFeedbackSender carFeedbackSender, com.mapbox.androidauto.car.feedback.ui.CarFeedbackPoll initialPoll, String? encodedSnapshot, com.mapbox.androidauto.car.feedback.core.CarFeedbackSearchOptions searchOptions = com.mapbox.androidauto.car.feedback.core.CarFeedbackSearchOptions(), kotlin.jvm.functions.Function0<kotlin.Unit> onFinish);
     method public androidx.car.app.model.Template onGetTemplate();
   }
 
@@ -345,11 +345,11 @@ package com.mapbox.androidauto.car.navigation {
     method public void onAttached(com.mapbox.maps.extension.androidauto.MapboxCarMapSurface mapboxCarMapSurface);
     method public void onDetached(com.mapbox.maps.extension.androidauto.MapboxCarMapSurface mapboxCarMapSurface);
     method public void onVisibleAreaChanged(android.graphics.Rect visibleArea, com.mapbox.maps.EdgeInsets edgeInsets);
-    method public void updateWithLocations(java.util.List<com.mapbox.geojson.Point> points);
+    method @UiThread public void updateWithLocations(java.util.List<com.mapbox.geojson.Point> points);
     field public static final double DEFAULT_INITIAL_ZOOM = 15.0;
   }
 
-  public final class CarNavigationCamera implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+  @UiThread public final class CarNavigationCamera implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
     ctor public CarNavigationCamera(com.mapbox.androidauto.car.navigation.CarCameraMode initialCarCameraMode, com.mapbox.androidauto.car.navigation.CarCameraMode? alternativeCarCameraMode, com.mapbox.androidauto.car.routes.CarRoutesProvider carRoutesProvider = com.mapbox.androidauto.car.routes.NavigationCarRoutesProvider(), com.mapbox.maps.CameraOptions? initialCameraOptions = CameraOptions.<init>().zoom(DEFAULT_INITIAL_ZOOM).build());
     method public boolean followingZoomUpdatesAllowed();
     method public com.mapbox.maps.extension.androidauto.DefaultMapboxCarMapGestureHandler getGestureHandler();
@@ -605,7 +605,7 @@ package com.mapbox.androidauto.car.placeslistonmap {
     property public final android.graphics.Bitmap? bitmap;
   }
 
-  public interface PlacesListItemClickListener {
+  @UiThread public interface PlacesListItemClickListener {
     method public void onItemClick(com.mapbox.androidauto.car.search.PlaceRecord placeRecord);
   }
 
@@ -614,7 +614,7 @@ package com.mapbox.androidauto.car.placeslistonmap {
     method public androidx.car.app.model.ItemList mapToItemList(android.location.Location anchorLocation, java.util.List<com.mapbox.androidauto.car.search.PlaceRecord> places, com.mapbox.androidauto.car.placeslistonmap.PlacesListItemClickListener? itemClickListener);
   }
 
-  public final class PlacesListOnMapLayerUtil {
+  @UiThread public final class PlacesListOnMapLayerUtil {
     ctor public PlacesListOnMapLayerUtil();
     method public void initializePlacesListOnMapLayer(com.mapbox.maps.Style style, android.content.res.Resources resources);
     method public void removePlacesListOnMapLayer(com.mapbox.maps.Style style);
@@ -631,7 +631,7 @@ package com.mapbox.androidauto.car.placeslistonmap {
   }
 
   @com.mapbox.maps.MapboxExperimental public final class PlacesListOnMapScreen extends androidx.car.app.Screen {
-    ctor public PlacesListOnMapScreen(com.mapbox.androidauto.car.MainCarContext mainCarContext, com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapProvider placesProvider, com.mapbox.androidauto.car.placeslistonmap.PlacesListItemMapper placesListItemMapper, java.util.List<? extends com.mapbox.androidauto.car.action.MapboxActionProvider> actionProviders, com.mapbox.androidauto.car.search.SearchCarContext searchCarContext = com.mapbox.androidauto.car.search.SearchCarContext(mainCarContext), com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil placesLayerUtil = com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil());
+    ctor @UiThread public PlacesListOnMapScreen(com.mapbox.androidauto.car.MainCarContext mainCarContext, com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapProvider placesProvider, com.mapbox.androidauto.car.placeslistonmap.PlacesListItemMapper placesListItemMapper, java.util.List<? extends com.mapbox.androidauto.car.action.MapboxActionProvider> actionProviders, com.mapbox.androidauto.car.search.SearchCarContext searchCarContext = com.mapbox.androidauto.car.search.SearchCarContext(mainCarContext), com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil placesLayerUtil = com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil());
     method public androidx.car.app.model.ItemList getItemList();
     method public androidx.car.app.model.Template onGetTemplate();
     method public void setItemList(androidx.car.app.model.ItemList);
@@ -655,7 +655,7 @@ package com.mapbox.androidauto.car.preview {
   }
 
   @com.mapbox.maps.MapboxExperimental public final class CarRoutePreviewScreen extends androidx.car.app.Screen {
-    ctor public CarRoutePreviewScreen(com.mapbox.androidauto.car.preview.RoutePreviewCarContext routePreviewCarContext, com.mapbox.androidauto.car.search.PlaceRecord placeRecord, java.util.List<com.mapbox.navigation.base.route.NavigationRoute> navigationRoutes, com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil placesLayerUtil = com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil());
+    ctor @UiThread public CarRoutePreviewScreen(com.mapbox.androidauto.car.preview.RoutePreviewCarContext routePreviewCarContext, com.mapbox.androidauto.car.search.PlaceRecord placeRecord, java.util.List<com.mapbox.navigation.base.route.NavigationRoute> navigationRoutes, com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil placesLayerUtil = com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapLayerUtil());
     method public com.mapbox.androidauto.car.location.CarLocationRenderer getCarLocationRenderer();
     method public com.mapbox.androidauto.car.navigation.CarNavigationCamera getCarNavigationCamera();
     method public com.mapbox.androidauto.car.preview.CarRouteLine getCarRouteLine();
@@ -672,10 +672,10 @@ package com.mapbox.androidauto.car.preview {
 
   public final class CarRouteRequest {
     ctor public CarRouteRequest(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation, com.mapbox.androidauto.car.preview.CarRouteOptionsInterceptor routeOptionsInterceptor, com.mapbox.navigation.ui.maps.location.NavigationLocationProvider navigationLocationProvider);
-    method public void cancelRequest();
+    method @UiThread public void cancelRequest();
     method public com.mapbox.navigation.core.MapboxNavigation getMapboxNavigation();
-    method public void request(com.mapbox.androidauto.car.search.PlaceRecord placeRecord, com.mapbox.androidauto.car.preview.CarRouteRequestCallback callback);
-    method public suspend Object? requestSync(com.mapbox.androidauto.car.search.PlaceRecord placeRecord, kotlin.coroutines.Continuation<? super java.util.List<? extends com.mapbox.navigation.base.route.NavigationRoute>>);
+    method @UiThread public void request(com.mapbox.androidauto.car.search.PlaceRecord placeRecord, com.mapbox.androidauto.car.preview.CarRouteRequestCallback callback);
+    method @UiThread public suspend Object? requestSync(com.mapbox.androidauto.car.search.PlaceRecord placeRecord, kotlin.coroutines.Continuation<? super java.util.List<? extends com.mapbox.navigation.base.route.NavigationRoute>>);
     property public final com.mapbox.navigation.core.MapboxNavigation mapboxNavigation;
   }
 
@@ -778,7 +778,7 @@ package com.mapbox.androidauto.car.search {
   }
 
   public final class PlaceSearchScreen extends androidx.car.app.Screen {
-    ctor public PlaceSearchScreen(com.mapbox.androidauto.car.search.SearchCarContext searchCarContext);
+    ctor @UiThread public PlaceSearchScreen(com.mapbox.androidauto.car.search.SearchCarContext searchCarContext);
     method public androidx.car.app.model.Template onGetTemplate();
   }
 
@@ -872,8 +872,8 @@ package com.mapbox.androidauto.deeplink {
 package com.mapbox.androidauto.navigation.audioguidance {
 
   public final class AppAudioGuidanceUiKt {
-    method public static void attachAudioGuidance(androidx.fragment.app.Fragment, com.mapbox.navigation.ui.voice.view.MapboxSoundButton mapboxSoundButton);
-    method public static void muteAudioGuidance(androidx.lifecycle.Lifecycle);
+    method @UiThread public static void attachAudioGuidance(androidx.fragment.app.Fragment, com.mapbox.navigation.ui.voice.view.MapboxSoundButton mapboxSoundButton);
+    method @UiThread public static void muteAudioGuidance(androidx.lifecycle.Lifecycle);
   }
 
   public final class CarAudioGuidanceUi implements com.mapbox.androidauto.car.action.MapboxActionProvider.ScreenActionProvider {
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/MapboxCarApp.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/MapboxCarApp.kt
@@ -1,5 +1,6 @@
 package com.mapbox.androidauto
 
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.navigation.location.CarAppLocation
 import com.mapbox.androidauto.navigation.location.impl.CarAppLocationImpl
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
@@ -35,6 +36,7 @@ object MapboxCarApp {
     /**
      * Setup android auto with defaults
      */
+    @UiThread
     @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
     fun setup() {
         if (MapboxNavigationApp.getObservers(CarAppLocation::class).isEmpty()) {
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/MainCarScreen.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/MainCarScreen.kt
@@ -1,5 +1,6 @@
 package com.mapbox.androidauto.car
 
+import androidx.annotation.UiThread
 import androidx.car.app.Screen
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.Template
@@ -19,7 +20,7 @@ import com.mapbox.maps.MapboxExperimental
  * When the app is launched from Android Auto
  */
 @OptIn(MapboxExperimental::class)
-class MainCarScreen(
+class MainCarScreen @UiThread constructor(
     private val mainCarContext: MainCarContext
 ) : Screen(mainCarContext.carContext) {
 
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/feedback/core/CarFeedbackSender.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/feedback/core/CarFeedbackSender.kt
@@ -1,6 +1,7 @@
 package com.mapbox.androidauto.car.feedback.core
 
 import androidx.annotation.Keep
+import androidx.annotation.UiThread
 import com.google.gson.Gson
 import com.mapbox.androidauto.car.feedback.ui.CarFeedbackItem
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
@@ -13,6 +14,7 @@ class CarFeedbackSender {
 
     private val gson = Gson()
 
+    @UiThread
     fun send(
         selectedItem: CarFeedbackItem,
         encodedSnapshot: String?,
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/feedback/ui/CarGridFeedbackScreen.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/feedback/ui/CarGridFeedbackScreen.kt
@@ -1,6 +1,7 @@
 package com.mapbox.androidauto.car.feedback.ui
 
 import androidx.activity.OnBackPressedCallback
+import androidx.annotation.UiThread
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
@@ -19,7 +20,7 @@ import com.mapbox.androidauto.internal.logAndroidAuto
 /**
  * This screen allows the user to search for a destination.
  */
-class CarGridFeedbackScreen constructor(
+class CarGridFeedbackScreen @UiThread constructor(
     carContext: CarContext,
     private val sourceScreenSimpleName: String,
     private val carFeedbackSender: CarFeedbackSender,
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/CarLocationsOverviewCamera.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/CarLocationsOverviewCamera.kt
@@ -2,6 +2,7 @@ package com.mapbox.androidauto.car.navigation
 
 import android.graphics.Rect
 import android.location.Location
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.geojson.Point
 import com.mapbox.maps.CameraOptions
@@ -114,6 +115,7 @@ class CarLocationsOverviewCamera(
         isLocationInitialized = false
     }
 
+    @UiThread
     fun updateWithLocations(points: List<Point>) {
         if (points.isNotEmpty()) {
             logAndroidAuto("LocationsOverviewCamera updateWithLocations")
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/CarNavigationCamera.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/CarNavigationCamera.kt
@@ -2,6 +2,7 @@ package com.mapbox.androidauto.car.navigation
 
 import android.graphics.Rect
 import android.location.Location
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.car.routes.CarRoutesProvider
 import com.mapbox.androidauto.car.routes.NavigationCarRoutesProvider
 import com.mapbox.androidauto.internal.car.RendererUtils.dpToPx
@@ -45,6 +46,7 @@ private const val DEFAULT_INITIAL_ZOOM = 15.0
  * @param initialCameraOptions set camera options when the camera is attached
  */
 @OptIn(MapboxExperimental::class)
+@UiThread
 class CarNavigationCamera(
     private val initialCarCameraMode: CarCameraMode,
     private val alternativeCarCameraMode: CarCameraMode?,
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListItemClickListener.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListItemClickListener.kt
@@ -1,7 +1,9 @@
 package com.mapbox.androidauto.car.placeslistonmap
 
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.car.search.PlaceRecord
 
+@UiThread
 interface PlacesListItemClickListener {
     fun onItemClick(placeRecord: PlaceRecord)
 }
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapLayerUtil.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapLayerUtil.kt
@@ -2,6 +2,7 @@ package com.mapbox.androidauto.car.placeslistonmap
 
 import android.content.res.Resources
 import android.graphics.BitmapFactory
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.R
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.Style
@@ -12,6 +13,7 @@ import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
 import com.mapbox.maps.extension.style.sources.generated.geoJsonSource
 import com.mapbox.maps.extension.style.sources.getSource
 
+@UiThread
 class PlacesListOnMapLayerUtil {
 
     fun initializePlacesListOnMapLayer(style: Style, resources: Resources) {
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapScreen.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapScreen.kt
@@ -1,6 +1,7 @@
 package com.mapbox.androidauto.car.placeslistonmap
 
 import androidx.annotation.StringRes
+import androidx.annotation.UiThread
 import androidx.annotation.VisibleForTesting
 import androidx.car.app.Screen
 import androidx.car.app.model.Action
@@ -40,7 +41,7 @@ import kotlinx.coroutines.withContext
 import java.util.concurrent.CopyOnWriteArrayList
 
 @MapboxExperimental
-class PlacesListOnMapScreen(
+class PlacesListOnMapScreen @UiThread constructor(
     private val mainCarContext: MainCarContext,
     private val placesProvider: PlacesListOnMapProvider,
     private val placesListItemMapper: PlacesListItemMapper,
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRoutePreviewScreen.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRoutePreviewScreen.kt
@@ -2,6 +2,7 @@ package com.mapbox.androidauto.car.preview
 
 import android.text.SpannableString
 import androidx.activity.OnBackPressedCallback
+import androidx.annotation.UiThread
 import androidx.car.app.Screen
 import androidx.car.app.model.Action
 import androidx.car.app.model.ActionStrip
@@ -41,7 +42,7 @@ import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
  * you select alternatives. From here, you can start turn-by-turn navigation.
  */
 @MapboxExperimental
-class CarRoutePreviewScreen(
+class CarRoutePreviewScreen @UiThread constructor(
     private val routePreviewCarContext: RoutePreviewCarContext,
     private val placeRecord: PlaceRecord,
     private val navigationRoutes: List<NavigationRoute>,
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRouteRequest.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRouteRequest.kt
@@ -1,5 +1,6 @@
 package com.mapbox.androidauto.car.preview
 
+import androidx.annotation.UiThread
 import com.mapbox.androidauto.car.search.PlaceRecord
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.androidauto.internal.logAndroidAutoFailure
@@ -39,6 +40,7 @@ class CarRouteRequest(
 ) {
     internal var currentRequestId: Long? = null
 
+    @UiThread
     suspend fun requestSync(placeRecord: PlaceRecord): List<NavigationRoute>? {
         return suspendCancellableCoroutine { continuation ->
             continuation.invokeOnCancellation { cancelRequest() }
@@ -74,6 +76,7 @@ class CarRouteRequest(
      *
      * @param searchResults potential destinations for directions
      */
+    @UiThread
     fun request(placeRecord: PlaceRecord, callback: CarRouteRequestCallback) {
         currentRequestId?.let { mapboxNavigation.cancelRouteRequest(it) }
 
@@ -99,6 +102,7 @@ class CarRouteRequest(
         }
     }
 
+    @UiThread
     fun cancelRequest() {
         currentRequestId?.let { mapboxNavigation.cancelRouteRequest(it) }
     }
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/search/PlaceSearchScreen.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/search/PlaceSearchScreen.kt
@@ -1,6 +1,7 @@
 package com.mapbox.androidauto.car.search
 
 import androidx.annotation.StringRes
+import androidx.annotation.UiThread
 import androidx.annotation.VisibleForTesting
 import androidx.car.app.Screen
 import androidx.car.app.model.Action
@@ -30,7 +31,7 @@ import kotlinx.coroutines.launch
  * This screen allows the user to search for a destination.
  */
 @OptIn(MapboxExperimental::class, ExperimentalPreviewMapboxNavigationAPI::class)
-class PlaceSearchScreen(
+class PlaceSearchScreen @UiThread constructor(
     private val searchCarContext: SearchCarContext,
 ) : Screen(searchCarContext.carContext) {
 
diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt
@@ -1,6 +1,7 @@
 package com.mapbox.androidauto.navigation.audioguidance
 
 import android.view.View
+import androidx.annotation.UiThread
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
@@ -13,6 +14,7 @@ import com.mapbox.navigation.ui.voice.view.MapboxSoundButton
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
+@UiThread
 fun Fragment.attachAudioGuidance(
     mapboxSoundButton: MapboxSoundButton
 ) {
@@ -38,6 +40,7 @@ fun Fragment.attachAudioGuidance(
 /**
  * Use this function to mute the audio guidance for a lifecycle.
  */
+@UiThread
 fun Lifecycle.muteAudioGuidance() {
     addObserver(object : DefaultLifecycleObserver {
         lateinit var initialState: MapboxAudioGuidanceState

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`package com.mapbox.androidauto.car.placeslistonmap`
`2`	`2`
	`3`	`+import androidx.annotation.UiThread`
`3`	`4`	`import com.mapbox.androidauto.car.search.PlaceRecord`
`4`	`5`
	`6`	`+@UiThread`
`5`	`7`	`interface PlacesListItemClickListener {`
`6`	`8`	`fun onItemClick(placeRecord: PlaceRecord)`
`7`	`9`	`}`