1 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 03e5ab29a..cc9a8e438 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -23,6 +23,7 @@ import android.graphics.drawable.GradientDrawable.Orientation;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.FloatRange;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -242,7 +243,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity
   @Override
   protected void onNewIntent(Intent intent) {
     LogUtil.i("InCallActivity.onNewIntent", "");
-    common.onNewIntent(intent);
 
     // If the screen is off, we need to make sure it gets turned on for incoming calls.
     // This normally works just fine thanks to FLAG_TURN_SCREEN_ON but that only works
@@ -250,8 +250,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity
     // for the call waiting case, we recreate() the current activity. There should be no jank from
     // this since the screen is already off and will remain so until our new activity is up.
     if (!isVisible()) {
+      common.onNewIntent(intent, true /* isRecreating */);
       LogUtil.i("InCallActivity.onNewIntent", "Restarting InCallActivity to force screen on.");
       recreate();
+    } else {
+      common.onNewIntent(intent, false /* isRecreating */);
     }
   }
 
@@ -485,6 +488,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity
     common.showWifiFailedDialog(call);
   }
 
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {
+    LogUtil.enterBlock("InCallActivity.onInternationalCallOnWifi");
+    common.showInternationalCallOnWifiDialog(call);
+  }
+
   public void setAllowOrientationChange(boolean allowOrientationChange) {
     if (!allowOrientationChange) {
       setRequestedOrientation(InCallOrientationEventListener.ACTIVITY_PREFERENCE_DISALLOW_ROTATION);
@@ -526,7 +534,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
         "shouldShowAnswerUi: %b, shouldShowVideoUi: %b, "
             + "didShowAnswerScreen: %b, didShowInCallScreen: %b, didShowVideoCallScreen: %b",
         shouldShowAnswerUi.shouldShow,
-        shouldShowVideoUi,
+        shouldShowVideoUi.shouldShow,
         didShowAnswerScreen,
         didShowInCallScreen,
         didShowVideoCallScreen);