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

Commit d41f2821 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8071527 from 4c8e02f6 to sc-v2-release

Change-Id: I118e712ac81844fc8b60c66fddc8e6f720af27e4
parents b9598091 4c8e02f6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
      case CallbackAction.VOICE:
        if (callLogCache.isVoicemailNumber(accountHandle, number)) {
          // Call to generic voicemail number, in case there are multiple accounts
          primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider(null));
          primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider());
        } else if (canSupportAssistedDialing()) {
          primaryActionButtonView.setTag(
              IntentProvider.getAssistedDialIntentProvider(
+2 −3
Original line number Diff line number Diff line
@@ -161,14 +161,13 @@ public abstract class IntentProvider {
    };
  }

  public static IntentProvider getReturnVoicemailCallIntentProvider(
      @Nullable PhoneAccountHandle phoneAccountHandle) {
  public static IntentProvider getReturnVoicemailCallIntentProvider() {
    return new IntentProvider() {
      @Override
      public Intent getIntent(Context context) {
        return PreCall.getIntent(
            context,
            CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.CALL_LOG));
            CallIntentBuilder.forVoicemail(CallInitiationType.Type.CALL_LOG));
      }
    };
  }
+2 −2
Original line number Diff line number Diff line
@@ -117,10 +117,10 @@ public class CallIntentBuilder implements Parcelable {
  }

  public static CallIntentBuilder forVoicemail(
      @Nullable PhoneAccountHandle phoneAccountHandle, CallInitiationType.Type callInitiationType) {
      CallInitiationType.Type callInitiationType) {
    return new CallIntentBuilder(
            Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null), callInitiationType)
        .setPhoneAccountHandle(phoneAccountHandle);
        .setPhoneAccountHandle(null);
  }

  public void setUri(@NonNull Uri uri) {
+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class CallCommand implements Command {
    CallIntentBuilder callIntentBuilder;
    if ("voicemail".equals(number)) {
      callIntentBuilder =
          CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.DIALPAD);
          CallIntentBuilder.forVoicemail(CallInitiationType.Type.DIALPAD);
    } else {
      callIntentBuilder = new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD);
    }
+1 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ public class DialpadFragment extends Fragment

  public void callVoicemail() {
    PreCall.start(
        getContext(), CallIntentBuilder.forVoicemail(null, CallInitiationType.Type.DIALPAD));
        getContext(), CallIntentBuilder.forVoicemail(CallInitiationType.Type.DIALPAD));
    hideAndClearDialpad();
  }

Loading