Skip to content

AdbMonitor should skip the check if we're running on an emulator #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Malinskiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AdbMonitor should skip the check if we're running on an emulator #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/src/main/java/jp/co/cyberagent/stf/Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}
}
}
}