Merge pull request #9 from KaKaVip/develop

add new detection x86 files
framgia · Jun 7, 2016 · b85c72c · b85c72c
2 parents a178448 + fae76f2
commit b85c72c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,15 +1,18 @@
 #Android emulator detector
 
-![](https://jitpack.io/v/framgia/android-emulator-detector.svg) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20emulator%20detector-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/3635)
+[![](https://jitpack.io/v/framgia/android-emulator-detector.svg)](https://jitpack.io/#framgia/android-emulator-detector) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20emulator%20detector-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/3635)
 
 Easy to detect android emulator
 
-#### Last check: 01/06/2016
+#### Last check: 07/06/2016
     - Checked on real devices in Device Farm (https://aws.amazon.com/device-farm/)
     - BlueStacks Version 0.9.30 
     - Genymotion Version 2.6.0
     - Android Emulator 
     - Andy 46.2.207.0
+    - MEmu play
+    - Nox App Player
+    - Koplayer
     - .....
 
 Download
@@ -30,7 +33,7 @@ allprojects {
 Step 2. Add the dependency
 ```groovy
 dependencies {
-	    compile 'com.github.framgia:android-emulator-detector:1.3.1'
+	    compile 'com.github.framgia:android-emulator-detector:1.3.2'
 }
 ```
 
@@ -51,7 +54,7 @@ Step 2. Add the dependency
 <dependency>
 	<groupId>com.github.framgia</groupId>
 	<artifactId>android-emulator-detector</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 </dependency>
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 23
         versionCode 1
-        versionName "1.3.1"
+        versionName "1.3.2"
     }
     buildTypes {
         release {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.0'
+    provided 'com.android.support:support-v4:23.0.0'
 }
diff --git a/library/src/main/java/com/framgia/android/emulator/EmulatorDetector.java b/library/src/main/java/com/framgia/android/emulator/EmulatorDetector.java
@@ -72,24 +72,38 @@ public interface OnEmulatorDetectorListener {
     };
 
     private static final String[] X86_FILES = {
-            "ueventd.android_x86.rc",
-            "x86.prop"
+        "ueventd.android_x86.rc",
+        "x86.prop",
+        "ueventd.ttVM_x86.rc",
+        "init.ttVM_x86.rc",
+        "fstab.ttVM_x86",
+        "fstab.vbox86",
+        "init.vbox86.rc",
+        "ueventd.vbox86.rc"
     };
 
     private static final String[] ANDY_FILES = {
         "fstab.andy",
         "ueventd.andy.rc"
     };
 
-    private static final Property[] PROPERTIES = {new Property("init.svc.qemud", null),
-            new Property("init.svc.qemu-props", null), new Property("qemu.hw.mainkeys", null),
-            new Property("qemu.sf.fake_camera", null), new Property("qemu.sf.lcd_density", null),
-            new Property("ro.bootloader", "unknown"), new Property("ro.bootmode", "unknown"),
-            new Property("ro.hardware", "goldfish"), new Property("ro.kernel.android.qemud", null),
-            new Property("ro.kernel.qemu.gles", null), new Property("ro.kernel.qemu", "1"),
-            new Property("ro.product.device", "generic"), new Property("ro.product.model", "sdk"),
-            new Property("ro.product.name", "sdk"),
-            new Property("ro.serialno", null)};
+    private static final Property[] PROPERTIES = {
+        new Property("init.svc.qemud", null),
+        new Property("init.svc.qemu-props", null),
+        new Property("qemu.hw.mainkeys", null),
+        new Property("qemu.sf.fake_camera", null),
+        new Property("qemu.sf.lcd_density", null),
+        new Property("ro.bootloader", "unknown"),
+        new Property("ro.bootmode", "unknown"),
+        new Property("ro.hardware", "goldfish"),
+        new Property("ro.kernel.android.qemud", null),
+        new Property("ro.kernel.qemu.gles", null),
+        new Property("ro.kernel.qemu", "1"),
+        new Property("ro.product.device", "generic"),
+        new Property("ro.product.model", "sdk"),
+        new Property("ro.product.name", "sdk"),
+        new Property("ro.serialno", null)
+    };
 
     private static final String IP = "10.0.2.15";