diff options
| author | Julien Desprez <jdesprez@google.com> | 2023-10-05 06:31:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 06:31:49 +0000 |
| commit | adf85649e61da60c22925d04b5e5775a96cbbf1d (patch) | |
| tree | 2d38ab66ac1319a396661ad8da53c2229c8fcb0e | |
| parent | 4ae12c1d75b43afdad6187a1a9c8ebb454f1bc77 (diff) | |
| parent | aa6a78e429ee2464745d8248d3c4bfa650e6832e (diff) | |
| download | tradefederation-tmp_amf_298295554.tar.gz | |
Amend force disable to only affect local invocation am: aa6a78e429tmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/2773876
Change-Id: Id30577a1d4f82b7d27d699f4e02eb2ddf045999d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/tradefed/targetprep/DeviceFlashPreparer.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java b/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java index c1dae4587..ee5584d29 100644 --- a/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java +++ b/src/com/android/tradefed/targetprep/DeviceFlashPreparer.java @@ -244,13 +244,15 @@ public abstract class DeviceFlashPreparer extends BaseTargetPreparer if (getHostOptions().isIncrementalFlashingEnabled()) { mUseIncrementalFlashing = true; } - if (mForceDisableIncrementalFlashing) { - mUseIncrementalFlashing = false; - } if (getHostOptions().isOptOutOfIncrementalFlashing()) { mUseIncrementalFlashing = false; } boolean useIncrementalFlashing = mUseIncrementalFlashing; + if (mForceDisableIncrementalFlashing) { + // The local option disable the feature, but doesn't prevent to + // continue tracking baseline + useIncrementalFlashing = false; + } if (useIncrementalFlashing) { boolean isIsolated = false; if (mConfig.getRetryDecision() instanceof BaseRetryDecision) { |