From c81e7a09f85909a52c0cbed807bcb701cd5dbe94 Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Mon, 3 Sep 2018 19:39:11 +0700 Subject: [PATCH] AdbMonitor should skip the check if we're running on an emulator --- app/src/main/java/jp/co/cyberagent/stf/Service.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/jp/co/cyberagent/stf/Service.java b/app/src/main/java/jp/co/cyberagent/stf/Service.java index b3eb3bb..cb96498 100644 --- a/app/src/main/java/jp/co/cyberagent/stf/Service.java +++ b/app/src/main/java/jp/co/cyberagent/stf/Service.java @@ -407,7 +407,7 @@ public void run() { * adb -d shell pm grant jp.co.cyberagent.stf android.permission.DUMP */ int dumpPermission = ContextCompat.checkSelfPermission(getApplication(), Manifest.permission.DUMP); - if (dumpPermission == PackageManager.PERMISSION_GRANTED) { + if (dumpPermission == PackageManager.PERMISSION_GRANTED && !isEmulator()) { String[] cmd = { "/system/bin/dumpsys", "usb" @@ -459,5 +459,16 @@ public void run() { Log.i(TAG, "Adb monitor thread interrupted"); } } + + private boolean isEmulator() { + String hardware = System.getProperty("ro.hardware"); + switch (hardware) { + case "goldfish": + case "ranchu": + return true; + default: + return false; + } + } } }