Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f12f7618 authored by Varun Berry's avatar Varun Berry Committed by Automerger Merge Worker
Browse files

Remove PhoneAccountHandle when building the intent to call Voicemail. am: ccb08c60 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Dialer/+/16199291

Change-Id: I4ef122f762207b77150a66cba4ac83bc7db6dd86
parents 06572a08 ccb08c60

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
      case CallbackAction.VOICE:

      case CallbackAction.VOICE:

        if (callLogCache.isVoicemailNumber(accountHandle, number)) {

        if (callLogCache.isVoicemailNumber(accountHandle, number)) {

          // Call to generic voicemail number, in case there are multiple accounts

          // Call to generic voicemail number, in case there are multiple accounts

          primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider(null));

          primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider());

        } else if (canSupportAssistedDialing()) {

        } else if (canSupportAssistedDialing()) {

          primaryActionButtonView.setTag(

          primaryActionButtonView.setTag(

              IntentProvider.getAssistedDialIntentProvider(

              IntentProvider.getAssistedDialIntentProvider(

java/com/android/dialer/app/calllog/IntentProvider.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -161,14 +161,13 @@ public abstract class IntentProvider { 
    };

    };

  }

  }





  public static IntentProvider getReturnVoicemailCallIntentProvider(

  public static IntentProvider getReturnVoicemailCallIntentProvider() {

      @Nullable PhoneAccountHandle phoneAccountHandle) {

    return new IntentProvider() {

    return new IntentProvider() {

      @Override

      @Override

      public Intent getIntent(Context context) {

      public Intent getIntent(Context context) {

        return PreCall.getIntent(

        return PreCall.getIntent(

            context,

            context,

            CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.CALL_LOG));

            CallIntentBuilder.forVoicemail(CallInitiationType.Type.CALL_LOG));

      }

      }

    };

    };

  }

  }

java/com/android/dialer/callintent/CallIntentBuilder.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -117,10 +117,10 @@ public class CallIntentBuilder implements Parcelable { 
  }

  }





  public static CallIntentBuilder forVoicemail(

  public static CallIntentBuilder forVoicemail(

      @Nullable PhoneAccountHandle phoneAccountHandle, CallInitiationType.Type callInitiationType) {

      CallInitiationType.Type callInitiationType) {

    return new CallIntentBuilder(

    return new CallIntentBuilder(

            Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null), callInitiationType)

            Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null), callInitiationType)

        .setPhoneAccountHandle(phoneAccountHandle);

        .setPhoneAccountHandle(null);

  }

  }





  public void setUri(@NonNull Uri uri) {

  public void setUri(@NonNull Uri uri) {

java/com/android/dialer/dialpadview/DialpadFragment.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1136,7 +1136,7 @@ public class DialpadFragment extends Fragment 




  public void callVoicemail() {

  public void callVoicemail() {

    PreCall.start(

    PreCall.start(

        getContext(), CallIntentBuilder.forVoicemail(null, CallInitiationType.Type.DIALPAD));

        getContext(), CallIntentBuilder.forVoicemail(CallInitiationType.Type.DIALPAD));

    hideAndClearDialpad();

    hideAndClearDialpad();

  }

  }

java/com/android/dialer/voicemail/listui/error/OmtpVoicemailMessageCreator.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_activating_title),

          context.getString(R.string.voicemail_error_activating_title),

          context.getString(R.string.voicemail_error_activating_message),

          context.getString(R.string.voicemail_error_activating_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()));

          VoicemailErrorMessage.createCallVoicemailAction(context));

    }

    }





    if (Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION == status.notificationChannelState) {

    if (Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION == status.notificationChannelState) {
@@ -77,7 +77,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_activation_failed_title),

          context.getString(R.string.voicemail_error_activation_failed_title),

          context.getString(R.string.voicemail_error_activation_failed_message),

          context.getString(R.string.voicemail_error_activation_failed_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -85,7 +85,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_no_data_title),

          context.getString(R.string.voicemail_error_no_data_title),

          context.getString(R.string.voicemail_error_no_data_message),

          context.getString(R.string.voicemail_error_no_data_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -93,7 +93,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_no_data_title),

          context.getString(R.string.voicemail_error_no_data_title),

          context.getString(R.string.voicemail_error_no_data_cellular_required_message),

          context.getString(R.string.voicemail_error_no_data_cellular_required_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -101,7 +101,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_bad_config_title),

          context.getString(R.string.voicemail_error_bad_config_title),

          context.getString(R.string.voicemail_error_bad_config_message),

          context.getString(R.string.voicemail_error_bad_config_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -109,7 +109,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_communication_title),

          context.getString(R.string.voicemail_error_communication_title),

          context.getString(R.string.voicemail_error_communication_message),

          context.getString(R.string.voicemail_error_communication_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -117,7 +117,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_server_title),

          context.getString(R.string.voicemail_error_server_title),

          context.getString(R.string.voicemail_error_server_message),

          context.getString(R.string.voicemail_error_server_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }
@@ -125,7 +125,7 @@ public class OmtpVoicemailMessageCreator { 
      return new VoicemailErrorMessage(

      return new VoicemailErrorMessage(

          context.getString(R.string.voicemail_error_server_connection_title),

          context.getString(R.string.voicemail_error_server_connection_title),

          context.getString(R.string.voicemail_error_server_connection_message),

          context.getString(R.string.voicemail_error_server_connection_message),

          VoicemailErrorMessage.createCallVoicemailAction(context, status.getPhoneAccountHandle()),

          VoicemailErrorMessage.createCallVoicemailAction(context),

          VoicemailErrorMessage.createRetryAction(context, status));

          VoicemailErrorMessage.createRetryAction(context, status));

    }

    }