Skip pre flash product check.

Bug: 63627003
Change-Id: Ifbc63929e284994ea21e76b004ff9722d3f9d3e5
(cherry picked from commit 8629658658b2b5a14a20d262b13d63e4ad78459f)

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java b/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java
index 99a47fd8b..38c1cda9f 100644
--- a/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java
+++ b/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java
@@ -68,7 +68,7 @@ public abstract class DeviceFlashPreparer implements ITargetCleaner {
         name = "skip-pre-flash-product-check",
         description = "Specify if device product type should be checked before flashing"
     )
-    private boolean mSkipPreFlashProductType = false;
+    private boolean mSkipPreFlashProductType = true;
 
     /*
      * A temporary workaround for special builds. Should be removed after changes from build team.
@@ -124,6 +124,15 @@ public abstract class DeviceFlashPreparer implements ITargetCleaner {
     }
 
     /**
+     * Sets the skipPreFlashProductType flag.
+     * <p/>
+     * Exposed for unit testing
+     */
+    void setSkipPreFlashProductType(boolean skipPreFlashProductType) {
+        mSkipPreFlashProductType = skipPreFlashProductType;
+    }
+
+    /**
      * Gets the interval between device boot poll attempts.
      * <p/>
      * Exposed for unit testing