Skip to content

Make the Crashlytics isEmulator check much more robust. #2515

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

Merged
mrober merged 4 commits into from
Mar 16, 2021
Merged

Make the Crashlytics isEmulator check much more robust. #2515

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4d96bc
Make the Crashlytics isEmulator check much more robust.
mrober Mar 16, 2021
af474f0
Clean up imports.
mrober Mar 16, 2021
cda1712
Simplify the isEmulator check for performance.
mrober Mar 16, 2021
0239813
Add a few more checks to isEmulator while being mindful of performanc…
mrober Mar 16, 2021
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
8 changes: 6 additions & 2 deletions ...rashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
public class CommonUtils {

private static final String SHA1_INSTANCE = "SHA-1";
private static final String GOOGLE_SDK = "google_sdk";
private static final String GOLDFISH = "goldfish";
private static final String RANCHU = "ranchu";
private static final String SDK = "sdk";

public static final String SHARED_PREFS_NAME = "com.google.firebase.crashlytics";
Expand Down Expand Up @@ -403,7 +404,10 @@ public static int getResourcesIdentifier(Context context, String key, String res
*/
public static boolean isEmulator(Context context) {
final String androidId = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
return SDK.equals(Build.PRODUCT) || GOOGLE_SDK.equals(Build.PRODUCT) || androidId == null;
return Build.PRODUCT.contains(SDK)
|| Build.HARDWARE.contains(GOLDFISH)
|| Build.HARDWARE.contains(RANCHU)
|| androidId == null;
}

public static boolean isRooted(Context context) {
Expand Down