From 73afb9c01aad6fef86c22aee9b1ea08917182c0e Mon Sep 17 00:00:00 2001
From: Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com>
Date: Tue, 13 Dec 2022 04:14:30 +0000
Subject: [PATCH] Refactor CountryDetectorServiceTest

-Modify notifyReceivers_twoListenersRegistered_bothNotified() to
 support immediate callback info to listeners based on ag/20470367

Bug: 262325136
Test: atest FrameworksServicesTests
Change-Id: I1f0b6f8244cbace325fde30c1fbad21aca44a710
---
 .../src/com/android/server/CountryDetectorServiceTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/CountryDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/CountryDetectorServiceTest.java
index 83a597dfad5c4..b0ad31d6a4306 100644
--- a/services/tests/servicestests/src/com/android/server/CountryDetectorServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/CountryDetectorServiceTest.java
@@ -179,8 +179,9 @@ public class CountryDetectorServiceTest {
         mCountryDetectorService.systemRunning();
         mCountryDetectorService.addCountryListener(countryListenerA);
         mCountryDetectorService.addCountryListener(countryListenerB);
-        expect.that(countryListenerA.isNotified()).isFalse();
-        expect.that(countryListenerB.isNotified()).isFalse();
+        //Immediate Callback Info support at ag/20470367
+        expect.that(countryListenerA.isNotified()).isTrue();
+        expect.that(countryListenerB.isNotified()).isTrue();
         mCountryDetectorService.notifyReceivers(country);
 
         expect.that(countryListenerA.isNotified()).isTrue();