fix(video): Prevent crash and ANR during content share stop#706
Merged
Conversation
Three fixes for content share teardown: 1. DefaultContentShareVideoClientController: Guard stopVideoShare() with isSharing check to prevent re-entrant calls. The callback from MediaProjection.onStop() and onContentShareStopped both trigger additional stopVideoShare() calls, causing javaStopService()+destroy() to execute 3-4 times on the main thread, blocking it past the 5s ANR threshold. 2. DefaultContentShareVideoClientController: Disconnect the video source adapter and stop sending BEFORE destroying the video client. Prevents frames flowing into freed native objects. 3. DefaultSurfaceTextureCaptureSource: Cancel pending handler messages (minFps resend timer) in stop() to prevent delayed frame delivery into a torn-down pipeline.
hensmi-amazon
previously approved these changes
Jun 11, 2026
dinmin-amzn
previously approved these changes
Jun 11, 2026
Move javaStopService() + destroy() to a background thread to prevent ANR. These calls block for 1-2s via signaling_thread_->BlockingCall() waiting for WebRTC peer connection close and signaling teardown. The video source adapter is disconnected synchronously on the main thread to prevent frames reaching freed native objects, then actual native cleanup runs asynchronously.
georgezy-amzn
dismissed stale reviews from dinmin-amzn and hensmi-amazon
via
9693498
hensmi-amazon
approved these changes
Jun 12, 2026
dinmin-amzn
approved these changes
Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ℹ️ Description
Three fixes for content share teardown:
DefaultContentShareVideoClientController: Guard stopVideoShare() with isSharing check to prevent re-entrant calls. The callback from MediaProjection.onStop() and onContentShareStopped both trigger additional stopVideoShare() calls, causing javaStopService()+destroy() to execute 3-4 times on the main thread, blocking it past the 5s ANR threshold.
DefaultContentShareVideoClientController: Disconnect the video source adapter and stop sending BEFORE destroying the video client. Prevents frames flowing into freed native objects.
DefaultSurfaceTextureCaptureSource: Cancel pending handler messages (minFps resend timer) in stop() to prevent delayed frame delivery into a torn-down pipeline.
Issue #, if available
Type of change
🧪 How Has This Been Tested?
describe the tests that you ran to verify your changes, any relevant details for your test configuration
Unit test coverage
Additional Manual Test
📱 Screenshots, if available
provide screenshots/video record if there's a UI change in demo app
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.