1 files changed, 10 insertions, 4 deletions

diff --git a/java/org/gnu/emacs/EmacsSurfaceView.java b/java/org/gnu/emacs/EmacsSurfaceView.java
index e9bae623930..2d80be0881a 100644
--- a/java/org/gnu/emacs/EmacsSurfaceView.java
+++ b/java/org/gnu/emacs/EmacsSurfaceView.java
@@ -79,10 +79,16 @@ public class EmacsSurfaceView extends View
 
     if (bitmap != null && frontBuffer == null)
       {
-        frontBuffer = Bitmap.createBitmap (bitmap.getWidth (),
-                                           bitmap.getHeight (),
-                                           Bitmap.Config.ARGB_8888,
-                                           false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+          frontBuffer = Bitmap.createBitmap (bitmap.getWidth (),
+                                             bitmap.getHeight (),
+                                             Bitmap.Config.ARGB_8888,
+                                             false);
+        else
+          frontBuffer = Bitmap.createBitmap (bitmap.getWidth (),
+                                             bitmap.getHeight (),
+                                             Bitmap.Config.ARGB_8888);
+
         bitmapCanvas = new Canvas (frontBuffer);
 
         /* And copy over the bitmap contents.  */