Merge pull request #3327 from mapbox/nb/maps-android-main-16-4-2025

Update maps-android from internal repo

GitOrigin-RevId: 24e944281eae024c1f9b2c37015f8a4899a34018

Author: persidskiy

CHANGELOG.md

@@ -3,11 +3,43 @@
 Mapbox welcomes participation and contributions from everyone.
 
 # main
+## Features ✨ and improvements 🏁
+* Expose `RenderThreadStatsRecorder` as experimental API. 
+
+
+# 11.12.0-rc.1
+## Features ✨ and improvements 🏁
+* Avoid fetching pixelRatio from gl-native while rendering scalebar to improve CPU usage.
+* Promote `MapView.attribution.getMapAttributionDelegate().extraAttributions` to stable.
+
+
+# 11.12.0-beta.1 April 09, 2025
 
 ## Features ✨ and improvements 🏁
 * Introduce experimental `colorUseTheme` API for `AmbientLight`, `DirectionalLight`, and `FlatLight` to override color theme of light.
 * [compose] Introduce experimental `colorUseTheme` API for `AmbientLightState`, `DirectionalLightState`, and `FlatLightState` to override color theme of light.
 * [compose] Introduce experimental `vignetteColorUseTheme` and `colorUseTheme` for `RainState` and `SnowState` which allows overriding color theme of precipitations.
+* [compose] Annotate `rememberGeoJsonSourceState` as delicate API due to performance implications when used with large GeoJsonData.
+* Avoid dynamic view annotation overlapping given symbol layers.
+* Vector icons can now also be retrieved via `getStyleImage` API.
+* Revert changes to `at` expression and add new `at-interpolated` expression.
+* Enable tile pack v2 format by default.
+
+## Bug fixes 🐞
+* Fix semi transparent landmark icons.
+* Return null for config expression if requested config option is missing.
+* Fix clipPath and mask rendering for vector icon rasterization.
+* Fix dotted lines on tile borders.
+* Fix pattern not found when using imports.
+* Fix line layer not rendering if using `line-pattern` inside an imported style.
+* Fix ground effect gradient not working with multiple polygons.
+* Add simple bounds check to avoid crash during centroid computation.
+* Fix invisible line when interpolating line-width from 0 to 1 using line-progress.
+* Tile loading speedup.
+* Fix URL migration to DB v10.
+
+## Dependencies
+* Update gl-native to v11.12.0-beta.1 and common to v24.12.0-beta.1.
 
 
 # 11.11.0 March 26, 2025

DEVELOPING.md

@@ -498,6 +498,36 @@ There are 2 types of traces that could be enabled:
 
 It is also possible to enable all the traces with `MapboxTracing.enableAll()`. Tracing could be disabled with `MapboxTracing.disableAll()`.
 
+### Recording traces using Perfetto UI
+
+The Perfetto Record settings can be edited when recording a new trace from [ui.perfetto.dev](https://ui.perfetto.dev/#!/record).
+We recommend to enable the following options in Perfetto and combine them with `MapboxTracing.enableAll()` enabled in application code:
+
+In **GPU** section. Enable `GPU frequency`, `GPU memory` and `GPU work period`:
+
+<img src="https://github.com/user-attachments/assets/7cc524c6-5253-4c33-a399-11a95d8f4315" width="400" height="300" alt="image">
+
+
+In **CPU** section. 
+Enable `Coarse CPU usage counter`, `Scheduling details` and `CPU frequency and idle states` (with default `Poll interval`).
+Please make sure the “Syscalls” **is not** selected, otherwise the trace gets bloated with these records and becomes unreadable.
+
+<img src="https://github.com/user-attachments/assets/2d6a29b1-3087-4501-998f-077db5038bce" width="400" height="300" alt="image">
+
+
+**Android apps & svcs**
+
+Please make sure the “Atrace userspace annotations” is selected and “Record events from all Android apps and services” is enabled (it is also required to record the Mapbox trace annotations).
+
+<img src="https://github.com/user-attachments/assets/f4978e0d-3165-4aa1-80e0-b747e7eda791" width="400" height="300" alt="image">
+
+Please note that this UI auto-generates the corresponding command line instructions - “Cmdline instructions” section
+
+<img src="https://github.com/user-attachments/assets/f55532df-fdff-4ba2-ac87-823deebfb1c0" width="400" height="300" alt="image">
+
+Produced html file can be opened in https://ui.perfetto.dev viewer.
+
+
 ### Recording traces using Android studio
 
 There are several ways of capturing traces for Android which are described in [official documentation](https://developer.android.com/topic/performance/tracing). As a reference we will describe the steps of recording traces using Android Studio Profiler:
@@ -527,16 +557,6 @@ After we exported trace recording we could use [Perfetto](https://ui.perfetto.de
 
 There are several other ways how to record traces.
 
-#### From ui.perfetto.dev over WebUSB
-
-<img width="240" alt="image" src="https://github.com/mapbox/mapbox-maps-android-internal/assets/1001009/ee1f1ff9-350a-436e-898a-8e0d05fae920">
-
-Enable Atrace events (other optional probes can be enabled if needed).
-
-<img width="70%" alt="image" src="https://github.com/mapbox/mapbox-maps-android-internal/assets/1001009/36cad2eb-9b0b-4545-ab4f-b3fb0cd5da7f">
-
-After `stop recording` is pressed, trace will be visible in the UI.
-
 #### Directly from the device (supported on Google Pixel devices)
 
 <img src="https://github.com/mapbox/mapbox-maps-android-internal/assets/1001009/f81f3217-55a6-4d07-a6c1-b40842cc1d83" width="60%">

LICENSE.md

@@ -482,7 +482,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-### MapboxCoreMaps,11.11.0,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,11.12.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 11.0

app/src/main/java/com/mapbox/maps/testapp/examples/SimulateNavigationRouteActivity.kt

@@ -1,14 +1,20 @@
 package com.mapbox.maps.testapp.examples
 
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.mapbox.api.directions.v5.models.DirectionsResponse
 import com.mapbox.core.constants.Constants
 import com.mapbox.geojson.LineString
 import com.mapbox.geojson.Point
 import com.mapbox.maps.MapView
+import com.mapbox.maps.MapboxExperimental
 import com.mapbox.maps.dsl.cameraOptions
+import com.mapbox.maps.logI
+import com.mapbox.maps.renderer.RenderThreadStats
+import com.mapbox.maps.renderer.RenderThreadStatsRecorder
+import com.mapbox.maps.testapp.examples.SimulateNavigationRouteActivity.Companion.SIMULATION_DURATION
 import com.mapbox.maps.testapp.examples.annotation.AnnotationUtils
 import com.mapbox.maps.testapp.utils.NavigationSimulator
 import kotlinx.coroutines.Dispatchers
@@ -18,12 +24,15 @@ import kotlinx.coroutines.withContext
 
 /**
  * Simulate a navigation route with pre-defined route (from LA to San Francisco) with location puck,
- * route line and camera tracking. The activity has disabled gestures and will run for 20 seconds.
- * At the end of the activity, there will be a toast showing the average fps, overtime frames
+ * route line and camera tracking. Gestures are disabled.
+ * The simulation will run [repetitions] times, and the network stack will be disabled after the 5th.
+ * On each iteration, the simulation will run for [SIMULATION_DURATION] milliseconds and some frame
+ * stats will be logged.
  */
+@OptIn(MapboxExperimental::class)
 class SimulateNavigationRouteActivity : AppCompatActivity() {
 
-  private lateinit var navigationSimulator: NavigationSimulator
+  private val repetitions = 3
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -37,6 +46,8 @@ class SimulateNavigationRouteActivity : AppCompatActivity() {
         zoom(9.0)
       }
     )
+    // Prevent screen from sleeping while running the simulation
+    window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     lifecycleScope.launch {
       val routePoints = withContext(Dispatchers.Default) {
         LineString.fromPolyline(
@@ -49,10 +60,13 @@ class SimulateNavigationRouteActivity : AppCompatActivity() {
           Constants.PRECISION_6
         )
       }
-      navigationSimulator = NavigationSimulator(mapView, routePoints)
-      navigationSimulator.apply {
-        disableGestures()
-        playCustomNavigationScripts(
+      repeat(repetitions) {
+        val renderThreadStatsRecorder = RenderThreadStatsRecorder()
+        mapView.setRenderThreadStatsRecorder(renderThreadStatsRecorder)
+        val navigationSimulator = NavigationSimulator(mapView, routePoints)
+        navigationSimulator.disableGestures()
+        renderThreadStatsRecorder.start()
+        navigationSimulator.playCustomNavigationScripts(
           NavigationSimulator.NavigationStep(INITIAL_OVERVIEW_DELAY_MS) {
             setCameraTrackingMode(NavigationSimulator.CameraFollowMode.FOLLOW)
           },
@@ -63,22 +77,30 @@ class SimulateNavigationRouteActivity : AppCompatActivity() {
             setCameraTrackingMode(NavigationSimulator.CameraFollowMode.FOLLOW)
           }
         )
+        delay(SIMULATION_DURATION)
+        logStats(renderThreadStatsRecorder.end())
+        navigationSimulator.onDestroy()
       }
-      delay(SIMULATION_DURATION)
       finish()
-      // Uncomment below to play the default navigation script in loop.
-      // navigationSimulator.playDefaultNavigationScriptsInLoop()
     }
   }
 
-  override fun onDestroy() {
-    super.onDestroy()
-    if (this::navigationSimulator.isInitialized) {
-      navigationSimulator.onDestroy()
-    }
+  private fun logStats(renderThreadStats: RenderThreadStats) = with(renderThreadStats) {
+    logI(TAG, "RenderThread Stats:")
+    logI(TAG, "\ttotal time: $totalTime ms")
+    logI(TAG, "\ttotal frames (rendered + skipped): $totalFrames")
+    logI(TAG, "\taverage FPS: ${(totalFrames / (totalTime / 1000F)).format()}")
+    logI(TAG, "\tskipped frames: $totalDroppedFrames")
+    logI(TAG, "\t50 percentile: ${percentile50.format()} ms")
+    logI(TAG, "\t90 percentile: ${percentile90.format()} ms")
+    logI(TAG, "\t95 percentile: ${percentile95.format()} ms")
+    logI(TAG, "\t99 percentile: ${percentile99.format()} ms")
   }
 
+  private fun Number?.format() = "%.3f".format(this)
+
   companion object {
+    private const val TAG = "SimulateNavigationRoute"
     private const val NAVIGATION_ROUTE_JSON_NAME = "navigation_route.json"
     private const val INITIAL_OVERVIEW_DELAY_MS = 3000L
     private const val FIRST_FOLLOW_MODE_DELAY_MS = 8000L

app/src/main/java/com/mapbox/maps/testapp/utils/FrameStatsRecorder.kt

@@ -195,10 +195,9 @@ class NavigationSimulator(
       )
       it.addLayer(casingLayer)
       it.addLayer(routeLayer)
-    mapView.recordFrameStats()
-    initLocationComponent()
-    viewportPlugin.transitionTo(overviewViewportState)
-    enableGestures()
+      initLocationComponent()
+      viewportPlugin.transitionTo(overviewViewportState)
+      enableGestures()
     }
   }
 
@@ -342,6 +341,11 @@ class NavigationSimulator(
   }
 
   fun onDestroy() {
+    mapView.mapboxMap.getStyle {
+      it.removeStyleLayer(casingLayer.layerId)
+      it.removeStyleLayer(routeLayer.layerId)
+      it.removeStyleSourceUnchecked(GEOJSON_SOURCE_ID)
+    }
     handler.removeCallbacksAndMessages(null)
     mapView.location.removeOnIndicatorPositionChangedListener(this)
     mapView.gestures.apply {
@@ -373,7 +377,6 @@ class NavigationSimulator(
   )
 
   companion object {
-    private const val TAG = "NavigationSimulator"
     private const val DEFAULT_CAMERA_MODE_SWITCH_INTERVAL_MS = 5000L
     private const val DEFAULT_SCRIPT_DURATION_MS = 20000L
     private const val DEFAULT_VIEWPORT_TRANSITION_MAX_DURATION = 2000L