commit ec4ab36d386ef8553658f05f7939dcad415319cc
author Neil Fuller <nfuller@google.com> Mon Sep 02 02:14:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 02 02:14:55 2019 -0700
tree 6f984cb9b36b917cfb6c10421d5ce43d59ccd1b4
parent cb5395d42cfad5a17064f4a1ce4d2558a3bb93e2
parent f09ed7d9f65d133acd5547ed8f28f5e94395e8b4

Merge "O Backport: Add a regression test for bug 118835133" into oreo-mr1-cts-dev
am: f09ed7d9f6

Change-Id: Id0ee939b0724d79f7a518d020eaa5759aed44aca

tests/tests/text/src/android/text/format/cts/TimeTest.java

diff --git a/tests/tests/text/src/android/text/format/cts/TimeTest.java b/tests/tests/text/src/android/text/format/cts/TimeTest.java
index 267b705..6112b73 100644
--- a/tests/tests/text/src/android/text/format/cts/TimeTest.java
+++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java
@@ -2824,6 +2824,13 @@
         Fields.verifyTimeEquals(expected, t);
     }
 
+    @Test
+    public void test_bug118835133() {
+        Time t = new Time("Asia/Singapore");
+        Fields.set(t, 2018, 9, 30, 12, 48, 32, 0 /* isDst */, 0, 0, 0);
+        // With http://b/118835133 toMillis() returns -1.
+        assertEquals(1540874912000L, t.toMillis(true /* ignoreDst */));
+    }
     private static void verifyNormalizeResult(boolean normalizeArgument, Time toNormalize,
             Time expectedTime, long expectedTimeMillis) {
         long actualTimeMillis = toNormalize.normalize(normalizeArgument /* ignore isDst */);