From 738374889c2f35785e53de7b98b9dc22117cea86 Mon Sep 17 00:00:00 2001
From: Vicamo Yang <vyang@mozilla.com>
Date: Tue, 14 May 2013 10:26:32 +0800
Subject: [PATCH] Bug 871440: bypass offline for both B2G emulator ARM & x86.
 r=jgriffin

---
 testing/marionette/marionette-actors.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index b42a1d1c8019..cb11b8a8157d 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -48,9 +48,11 @@ try {
     return libcutils;
   });
   if (libcutils) {
+    let qemu = libcutils.property_get("ro.kernel.qemu");
+    logger.info("B2G emulator: " + (qemu == "1" ? "yes" : "no"));
     let platform = libcutils.property_get("ro.product.device");
     logger.info("Platform detected is " + platform);
-    bypassOffline = (platform == "generic" || platform == "panda");
+    bypassOffline = (qemu == "1" || platform == "panda");
   }
 }
 catch(e) {}