Merge "Can set timezone property in DeviceSetup"

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/tradefed/targetprep/DeviceSetup.java b/src/com/android/tradefed/targetprep/DeviceSetup.java
index 282e4ee16..6eb649975 100644
--- a/src/com/android/tradefed/targetprep/DeviceSetup.java
+++ b/src/com/android/tradefed/targetprep/DeviceSetup.java
@@ -209,6 +209,11 @@ public class DeviceSetup implements ITargetPreparer, ITargetCleaner {
     // ON:  settings put system auto_timezone 1
     // OFF: settings put system auto_timezone 0
 
+    @Option(name = "set-timezone",
+            description = "Set timezone property by TZ name " +
+            "(http://en.wikipedia.org/wiki/List_of_tz_database_time_zones)")
+    protected String mTimezone = null;
+
     // Calling
     @Option(name = "disable-dialing",
             description = "Disable dialing")
@@ -537,6 +542,10 @@ public class DeviceSetup implements ITargetPreparer, ITargetCleaner {
 
         setSettingForBinaryState(mAutoUpdateTimezone, mSystemSettings, "auto_timezone", "1", "0");
 
+        if (mTimezone != null) {
+            mSetProps.put("persist.sys.timezone", mTimezone);
+        }
+
         if (mDisableDialing) {
             mSetProps.put("ro.telephony.disable-call", "true");
         }