From ca04d58e27db36f73cead9a31407892911c9e062 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 5 Jan 2018 13:47:13 +0100 Subject: [PATCH] [android] - detect genymotion virtual machines when determening attributes for eglConfig --- .../maps/renderer/egl/EGLConfigChooser.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java index b6f467708fa..247ffea9065 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps.renderer.egl; import android.opengl.GLSurfaceView; +import android.os.Build; import android.support.annotation.NonNull; import java.util.ArrayList; @@ -261,9 +262,8 @@ private int getConfigAttr(EGL10 egl, EGLDisplay display, EGLConfig config, int a return attributevalue[0]; } - private int[] getConfigAttributes() { - boolean emulator = inEmulator(); + boolean emulator = inEmulator() || inGenymotion(); Timber.i("In emulator: %s", emulator); // Get all configs at least RGB 565 with 16 depth and 8 stencil @@ -290,4 +290,12 @@ private int[] getConfigAttributes() { private boolean inEmulator() { return System.getProperty("ro.kernel.qemu") != null; } + + /** + * Detect if we are in genymotion + */ + private boolean inGenymotion() { + return Build.MANUFACTURER.contains("Genymotion"); + } + }