Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index 4b0a3cd..14531e0 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -21,7 +21,7 @@
import android.app.ActivityManager.TaskDescription;
import android.app.AlertDialog;
import android.app.Dialog;
-import android.content.Context;
+import android.app.KeyguardManager;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener;
@@ -36,10 +36,7 @@
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.res.ResourcesCompat;
-import android.telecom.DisconnectCause;
import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
-import android.util.Pair;
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
@@ -62,9 +59,9 @@
import com.android.incallui.call.DialerCall;
import com.android.incallui.call.DialerCall.State;
import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.disconnectdialog.DisconnectMessage;
import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment;
import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment.Callback;
-import com.android.incallui.wifi.EnableWifiCallingPrompt;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -109,6 +106,8 @@
private boolean animateDialpadOnShow;
private String dtmfTextToPreopulate;
@DialpadRequestType private int showDialpadRequest = DIALPAD_REQUEST_NONE;
+ // If activity is going to be recreated. This is usually happening in {@link onNewIntent}.
+ private boolean isRecreating;
private final SelectPhoneAccountListener selectAccountListener =
new SelectPhoneAccountListener() {
@@ -213,7 +212,8 @@
}
});
- if (icicle != null) {
+ // Don't override the value if show dialpad request is true in intent extras.
+ if (icicle != null && showDialpadRequest == DIALPAD_REQUEST_NONE) {
// If the dialpad was shown before, set variables indicating it should be shown and
// populated with the previous DTMF text. The dialpad is actually shown and populated
// in onResume() to ensure the hosting fragment has been inflated and is ready to receive it.
@@ -323,6 +323,18 @@
}
public void onStop() {
+ // Disconnects call waiting for account when activity is hidden e.g. user press home button.
+ // This is necessary otherwise the pending call will stuck on account choose and no new call
+ // will be able to create. See b/63600434 for more details.
+ // Skip this on locked screen since the activity may go over life cycle and start again.
+ if (!isRecreating
+ && !inCallActivity.getSystemService(KeyguardManager.class).isKeyguardLocked()) {
+ DialerCall waitingForAccountCall = CallList.getInstance().getWaitingForAccountCall();
+ if (waitingForAccountCall != null) {
+ waitingForAccountCall.disconnect();
+ }
+ }
+
enableInCallOrientationEventListener(false);
InCallPresenter.getInstance().updateIsChangingConfigurations();
InCallPresenter.getInstance().onActivityStopped();
@@ -335,6 +347,7 @@
void onNewIntent(Intent intent, boolean isRecreating) {
LogUtil.i("InCallActivityCommon.onNewIntent", "");
+ this.isRecreating = isRecreating;
// We're being re-launched with a new Intent. Since it's possible for a
// single InCallActivity instance to persist indefinitely (even if we
@@ -497,18 +510,15 @@
}
}
- public void maybeShowErrorDialogOnDisconnect(DisconnectCause cause) {
+ public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) {
LogUtil.i(
- "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", "disconnect cause: %s", cause);
+ "InCallActivityCommon.maybeShowErrorDialogOnDisconnect",
+ "disconnect cause: %s",
+ disconnectMessage);
if (!inCallActivity.isFinishing()) {
- if (EnableWifiCallingPrompt.shouldShowPrompt(cause)) {
- Pair<Dialog, CharSequence> pair =
- EnableWifiCallingPrompt.createDialog(inCallActivity, cause);
- showErrorDialog(pair.first, pair.second);
- } else if (shouldShowDisconnectErrorDialog(cause)) {
- Pair<Dialog, CharSequence> pair = getDisconnectErrorDialog(inCallActivity, cause);
- showErrorDialog(pair.first, pair.second);
+ if (disconnectMessage.dialog != null) {
+ showErrorDialog(disconnectMessage.dialog, disconnectMessage.toastMessage);
}
}
}
@@ -557,23 +567,6 @@
}
}
- private static boolean shouldShowDisconnectErrorDialog(@NonNull DisconnectCause cause) {
- return !TextUtils.isEmpty(cause.getDescription())
- && (cause.getCode() == DisconnectCause.ERROR
- || cause.getCode() == DisconnectCause.RESTRICTED);
- }
-
- private static Pair<Dialog, CharSequence> getDisconnectErrorDialog(
- @NonNull Context context, @NonNull DisconnectCause cause) {
- CharSequence message = cause.getDescription();
- Dialog dialog =
- new AlertDialog.Builder(context)
- .setMessage(message)
- .setPositiveButton(android.R.string.ok, null)
- .create();
- return new Pair<>(dialog, message);
- }
-
private void showErrorDialog(Dialog dialog, CharSequence message) {
LogUtil.i("InCallActivityCommon.showErrorDialog", "message: %s", message);
inCallActivity.dismissPendingDialogs();