Enable optimized-property-setting by default
Bug: 184304964
Test: DeviceSetupTest and manually tested conditions
Change-Id: I8cc13e9e16f2c240392ece55d6eab226f0841909
diff --git a/javatests/com/android/tradefed/targetprep/DeviceSetupTest.java b/javatests/com/android/tradefed/targetprep/DeviceSetupTest.java
index 7c9d5e5..447e444 100644
--- a/javatests/com/android/tradefed/targetprep/DeviceSetupTest.java
+++ b/javatests/com/android/tradefed/targetprep/DeviceSetupTest.java
@@ -79,6 +79,8 @@
mMockBuildInfo = new DeviceBuildInfo("0", "");
mDeviceSetup = new DeviceSetup();
+ OptionSetter setter = new OptionSetter(mDeviceSetup);
+ setter.setOptionValue("optimized-property-setting", Boolean.toString(false));
mTmpDir = FileUtil.createTempDir("tmp");
IInvocationContext context = new InvocationContext();
context.addAllocatedDevice("device", mMockDevice);
diff --git a/src/com/android/tradefed/targetprep/DeviceSetup.java b/src/com/android/tradefed/targetprep/DeviceSetup.java
index 7e681c3..b8c7581 100644
--- a/src/com/android/tradefed/targetprep/DeviceSetup.java
+++ b/src/com/android/tradefed/targetprep/DeviceSetup.java
@@ -419,7 +419,7 @@
name = "optimized-property-setting",
description =
"If a property is already set to the desired value, don't reboot the device")
- protected boolean mOptimizedPropertySetting = false;
+ protected boolean mOptimizedPropertySetting = true;
// Deprecated options follow
/**
