diff options
author | Xing Dai <xingdai@google.com> | 2017-07-13 13:03:40 -0700 |
---|---|---|
committer | Julien Desprez <jdesprez@google.com> | 2017-07-17 11:26:21 +0000 |
commit | b27935e046e4d91439897e6fc963efb2f86546d2 (patch) | |
tree | 2375cc2735d7720b56491446dc6986b18e1eef03 /src/com/android/tradefed/targetprep/DeviceFlashPreparer.java | |
parent | d988dd396c56b453b0bcdc21122342b479c6f758 (diff) | |
download | tradefederation-b27935e046e4d91439897e6fc963efb2f86546d2.tar.gz |
Skip pre flash product check.
Bug: 63627003
Change-Id: Ifbc63929e284994ea21e76b004ff9722d3f9d3e5
(cherry picked from commit 8629658658b2b5a14a20d262b13d63e4ad78459f)
Diffstat (limited to 'src/com/android/tradefed/targetprep/DeviceFlashPreparer.java')
-rw-r--r-- | src/com/android/tradefed/targetprep/DeviceFlashPreparer.java | 11 |
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 |