From 83b9f520290c4565a60877d07b436c1b4d7cf71e Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Wed, 24 Nov 2021 13:31:10 +0000
Subject: [PATCH] Fix test flakiness

Flakiness noticed while running tests locally.

Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/
Change-Id: I805bdf840f6b8c2ae6512b01fcb910af50478d2d
---
 .../server/timezonedetector/TimeZoneDetectorServiceTest.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java
index ce3b78e2b5f78..19269e05903be 100644
--- a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java
@@ -190,6 +190,9 @@ public class TimeZoneDetectorServiceTest {
                     createTimeZoneConfiguration(true /* autoDetectionEnabled */);
             mTimeZoneDetectorService.updateConfiguration(autoDetectEnabledConfiguration);
 
+            // The configuration update notification is asynchronous.
+            mTestHandler.waitForMessagesToBeProcessed();
+
             verify(mMockContext).enforceCallingPermission(
                     eq(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION),
                     anyString());