summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-16 19:02:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-16 19:02:48 +0000
commit89f213f36fa5b0d10dbb5e5304651cb18982855e (patch)
tree7e91a2c10c324ba72bc6fddb7736a0684ea32ba3
parent053c87de7db1f9c589757c5ccff2f28552a1ef36 (diff)
parent87e60d5454b85ee5d6747906d3b8ac7e5c0ce7d5 (diff)
Merge "Fix TimeZoneDetectorStrategyTest" am: 41c13aa123 am: 87e60d5454
Change-Id: I6f7ddc9f4067fea19bb5957c8c9b3166f6f44651
-rw-r--r--services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorStrategyTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorStrategyTest.java b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorStrategyTest.java
index cb49fefb8047..2429cfc1bcd0 100644
--- a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorStrategyTest.java
+++ b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorStrategyTest.java
@@ -453,7 +453,7 @@ public class TimeZoneDetectorStrategyTest {
@Override
public boolean isDeviceTimeZoneInitialized() {
- return mTimeZoneId != null;
+ return mTimeZoneId.getLatest() != null;
}
@Override