commit d43fd34c857030ee7d20730601b7a6b705aa10ba
author Jorg Pleumann <nobody@android.com> Thu May 07 09:29:39 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu May 07 09:29:39 2009 -0700
tree 8d602a24eef603fc89b26a603bfdfe4c9d3806ce
parent dc52411b16a69583d222f05d2cf5adb8a1f34c14
parent 43ad2f6fa7e931296e787926f948070044fd54a0

am 43ad2f6: AI 148448: A tiny, tiny fix for the new CTS test runner

Merge commit '43ad2f6fa7e931296e787926f948070044fd54a0' into donut

* commit '43ad2f6fa7e931296e787926f948070044fd54a0':
  AI 148448: A tiny, tiny fix for the new CTS test runner

tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java

diff --git a/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java b/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
index 0354d98..5ac7251 100644
--- a/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
+++ b/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
@@ -20,6 +20,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.List;
+import java.util.TimeZone;
 
 import com.android.internal.util.Predicate;
 import com.android.internal.util.Predicates;
@@ -75,6 +76,8 @@
         System.setProperty("javax.net.ssl.trustStore",
                 "/etc/security/cacerts.bks");
         
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+        
         if (arguments != null) {
             String classArg = arguments.getString(ARGUMENT_TEST_CLASS);
             singleTest = classArg != null && classArg.contains("#");