Snap for 5322077 from cb1bdfa44357c3efbe5b9dc1cff24e33707d6607 to pi-qpr3-release
Change-Id: Iec2e5ead64e49de734f97c4cc549f9faba4b5786
diff --git a/tests/src/com/android/tradefed/device/NativeDeviceTest.java b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
index d9329fa..ff0141b 100644
--- a/tests/src/com/android/tradefed/device/NativeDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
@@ -54,6 +54,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.time.Clock;
import java.util.ArrayList;
import java.util.Arrays;
@@ -2276,8 +2277,12 @@
SettableFuture<String> value = SettableFuture.create();
value.set("23");
EasyMock.expect(mMockIDevice.getSystemProperty("ro.build.version.sdk")).andReturn(value);
+ SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm:ss.mmm");
+ String dateFormatted = format.format(new Date(date));
+
mMockIDevice.executeShellCommand(
- EasyMock.eq("logcat -v threadtime -t '12-11 03:15:42.015'"), EasyMock.anyObject());
+ EasyMock.eq(String.format("logcat -v threadtime -t '%s'", dateFormatted)),
+ EasyMock.anyObject());
EasyMock.replay(mMockIDevice);
mTestDevice.getLogcatSince(date);
EasyMock.verify(mMockIDevice);
