summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-09-06 11:26:16 +0200
committerTobrun <tobrun@mapbox.com>2018-09-06 12:51:33 +0200
commit21ed57a732f888e802e8abc0fe13362b2bfaff68 (patch)
tree0536655f74a8fd7f551daedbc8bf45af416a28de
parentcb141e89b7225b2bd75bad237a3dad44e6f49872 (diff)
downloadqtlocation-mapboxgl-21ed57a732f888e802e8abc0fe13362b2bfaff68.tar.gz
[android] - update isEmulator check
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java9
1 files changed, 8 insertions, 1 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 cc29166b36..65db8241cf 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
@@ -306,7 +306,14 @@ public class EGLConfigChooser implements GLSurfaceView.EGLConfigChooser {
* Detect if we are in emulator.
*/
private boolean inEmulator() {
- return System.getProperty("ro.kernel.qemu") != null;
+ return Build.FINGERPRINT.startsWith("generic")
+ || Build.FINGERPRINT.startsWith("unknown")
+ || Build.MODEL.contains("google_sdk")
+ || Build.MODEL.contains("Emulator")
+ || Build.MODEL.contains("Android SDK built for x86")
+ || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+ || "google_sdk".equals(Build.PRODUCT)
+ || System.getProperty("ro.kernel.qemu") != null;
}
/**