1 files changed, 20 insertions, 6 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 26fd926d1..34f0cc0d7 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -28,11 +28,11 @@ import android.telecom.Call;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
 import android.util.ArrayMap;
-import com.android.contacts.common.GeoUtil;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.shortcuts.ShortcutUsageReporter;
@@ -95,7 +95,7 @@ public class CallList implements DialerCallDelegate {
 
   /**
    * USED ONLY FOR TESTING Testing-only constructor. Instance should only be acquired through
-   * getInstance().
+   * getRunningInstance().
    */
   @VisibleForTesting
   public CallList() {}
@@ -290,6 +290,10 @@ public class CallList implements DialerCallDelegate {
             "CallList.onCallRemoved", "Removing call not previously disconnected " + call.getId());
       }
     }
+
+    if (!hasLiveCall()) {
+      DialerCall.clearRestrictedCount();
+    }
   }
 
   InCallUiLegacyBindings getLegacyBindings(Context context) {
@@ -723,15 +727,17 @@ public class CallList implements DialerCallDelegate {
      * WiFi
      */
     void onHandoverToWifiFailed(DialerCall call);
+
+    /** Called when the user initiates a call to an international number while on WiFi. */
+    void onInternationalCallOnWifi(@NonNull DialerCall call);
   }
 
   private class DialerCallListenerImpl implements DialerCallListener {
 
-    private final DialerCall mCall;
+    @NonNull private final DialerCall mCall;
 
-    DialerCallListenerImpl(DialerCall call) {
-      Assert.isNotNull(call);
-      mCall = call;
+    DialerCallListenerImpl(@NonNull DialerCall call) {
+      mCall = Assert.isNotNull(call);
     }
 
     @Override
@@ -779,6 +785,14 @@ public class CallList implements DialerCallDelegate {
     }
 
     @Override
+    public void onInternationalCallOnWifi() {
+      LogUtil.enterBlock("DialerCallListenerImpl.onInternationalCallOnWifi");
+      for (Listener listener : mListeners) {
+        listener.onInternationalCallOnWifi(mCall);
+      }
+    }
+
+    @Override
     public void onDialerCallSessionModificationStateChange() {
       for (Listener listener : mListeners) {
         listener.onSessionModificationStateChange(mCall);