commit bb361ab01bd8efcb1bb7ac9b1de07013da54227a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 13 02:37:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 02:37:46 2019 +0000
tree 9d0a58690af4e02ca5973de2a55f713085b17d46
parent 698c639f37b2a90596727bc0cbe2ed75c2a694df
parent 0fd9e56868fe85740fb75e43ea50e9125ef8bdc7

Merge "Force a timezone when setting the date on the device"

src/com/android/tradefed/device/NativeDevice.java

diff --git a/src/com/android/tradefed/device/NativeDevice.java b/src/com/android/tradefed/device/NativeDevice.java
index 8724cf9..82ba4ba 100644
--- a/src/com/android/tradefed/device/NativeDevice.java
+++ b/src/com/android/tradefed/device/NativeDevice.java
@@ -3606,7 +3606,8 @@
             dateString = sdf.format(date);
         }
         // best effort, no verification
-        executeShellCommand("date -u " + dateString);
+        // Use TZ= to default to UTC timezone (b/128353510 for background)
+        executeShellCommand("TZ=UTC date -u " + dateString);
     }
 
     /**

tests/src/com/android/tradefed/device/NativeDeviceTest.java

diff --git a/tests/src/com/android/tradefed/device/NativeDeviceTest.java b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
index d9ae9ed..605238f 100644
--- a/tests/src/com/android/tradefed/device/NativeDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
@@ -1853,7 +1853,7 @@
                     public String executeShellCommand(String command)
                             throws DeviceNotAvailableException {
                         CLog.e("%s", command);
-                        assertEquals("date -u 102010212016.21", command);
+                        assertEquals("TZ=UTC date -u 102010212016.21", command);
                         return command;
                     }
                 };
@@ -1884,7 +1884,7 @@
                     public String executeShellCommand(String command)
                             throws DeviceNotAvailableException {
                         CLog.e("%s", command);
-                        assertEquals("date -u 1476958881", command);
+                        assertEquals("TZ=UTC date -u 1476958881", command);
                         return command;
                     }
                 };