commit fe705b2d59092fcbf5976485dd4c277abf4a2d41
author Emilian Peev <epeev@google.com> Tue Apr 23 22:36:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 23 22:36:07 2019 -0700
tree c4aff755138f3c606cd1296ba26ab878e8e899fa
parent 9778d7ff81dc741e0b27e178520e5aa293f0ae9b
parent 6c0d305f356deb245838716a11fb42df9c6332f2

Merge "Check and configure pixel format when locking canvas" into qt-dev am: f8d04b2d2f
am: 6c0d305f35

Change-Id: Icd858aff2e6e8fadc9834d2aeeb9da18b83ce034

core/jni/android_view_Surface.cpp

diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index a900294..ccadc7d 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -212,6 +212,10 @@
         return 0;
     }
 
+    if (convertPixelFormat(ANativeWindow_getFormat(surface.get())) == kUnknown_SkColorType) {
+        native_window_set_buffers_format(surface.get(), PIXEL_FORMAT_RGBA_8888);
+    }
+
     Rect dirtyRect(Rect::EMPTY_RECT);
     Rect* dirtyRectPtr = NULL;