Skip to content
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

Jump to bottom

[CP-stable]Add a check for the surface if it is valid #56301

Open
wants to merge 1 commit into
base: flutter-3.24-candidate.0
Choose a base branch
from
Open

[CP-stable]Add a check for the surface if it is valid #56301

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
6 changes: 6 additions & 0 deletions shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,13 @@ public void draw(Canvas canvas) {
Log.e(TAG, "Platform view cannot be composed without a RenderTarget.");
return;
}

final Surface targetSurface = renderTarget.getSurface();
if (!targetSurface.isValid()) {
Log.e(TAG, "Platform view cannot be composed without a valid RenderTarget surface.");
return;
}

final Canvas targetCanvas = targetSurface.lockHardwareCanvas();
if (targetCanvas == null) {
// Cannot render right now.
Expand Down
33 changes: 33 additions & 0 deletions shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.view.Surface;
import android.view.View;
import android.view.View.OnFocusChangeListener;
import android.view.ViewGroup;
Expand All @@ -23,6 +24,7 @@
import android.widget.FrameLayout;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
Expand Down Expand Up @@ -63,6 +65,37 @@ public void onDraw(Canvas canvas) {
verify(canvas, times(1)).drawColor(Color.RED);
}

@Test
public void draw_withoutValidSurface() {
FlutterRenderer.debugDisableSurfaceClear = true;
final Surface surface = mock(Surface.class);
when(surface.isValid()).thenReturn(false);
final PlatformViewRenderTarget renderTarget = mock(PlatformViewRenderTarget.class);
when(renderTarget.getSurface()).thenReturn(surface);

final PlatformViewWrapper wrapper = new PlatformViewWrapper(ctx, renderTarget);
final Canvas canvas = mock(Canvas.class);
wrapper.draw(canvas);

verify(canvas, times(0)).drawColor(Color.TRANSPARENT, android.graphics.PorterDuff.Mode.CLEAR);
}

@Test
public void draw_withValidSurface() {
FlutterRenderer.debugDisableSurfaceClear = true;
final Canvas canvas = mock(Canvas.class);
final Surface surface = mock(Surface.class);
when(surface.isValid()).thenReturn(true);
final PlatformViewRenderTarget renderTarget = mock(PlatformViewRenderTarget.class);
when(renderTarget.getSurface()).thenReturn(surface);
when(surface.lockHardwareCanvas()).thenReturn(canvas);
final PlatformViewWrapper wrapper = new PlatformViewWrapper(ctx, renderTarget);

wrapper.draw(canvas);

verify(canvas, times(1)).drawColor(Color.TRANSPARENT, android.graphics.PorterDuff.Mode.CLEAR);
}

@Test
public void focusChangeListener_hasFocus() {
final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
Expand Down