Skip to content

Commit 7c8ed10

Browse files
authored
Make the Crashlytics isEmulator check much more robust. (#2515)
1 parent 352ac58 commit 7c8ed10

File tree

1 file changed

+6
-2
lines changed
  • firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common

1 file changed

+6
-2
lines changed

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
public class CommonUtils {
5353

5454
private static final String SHA1_INSTANCE = "SHA-1";
55-
private static final String GOOGLE_SDK = "google_sdk";
55+
private static final String GOLDFISH = "goldfish";
56+
private static final String RANCHU = "ranchu";
5657
private static final String SDK = "sdk";
5758

5859
public static final String SHARED_PREFS_NAME = "com.google.firebase.crashlytics";
@@ -403,7 +404,10 @@ public static int getResourcesIdentifier(Context context, String key, String res
403404
*/
404405
public static boolean isEmulator(Context context) {
405406
final String androidId = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
406-
return SDK.equals(Build.PRODUCT) || GOOGLE_SDK.equals(Build.PRODUCT) || androidId == null;
407+
return Build.PRODUCT.contains(SDK)
408+
|| Build.HARDWARE.contains(GOLDFISH)
409+
|| Build.HARDWARE.contains(RANCHU)
410+
|| androidId == null;
407411
}
408412

409413
public static boolean isRooted(Context context) {

0 commit comments

Comments
 (0)