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

Commit 883faa0d authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12L"

parents 118a9618 6899ca99

AndroidManifest.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,10 @@ 
   presses home. -->

   presses home. -->

  <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>

  <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>





  <!-- Used for sending PendingIntents to dynamically registered receivers -->

  <uses-permission android:name="com.android.dialer.permission.DIALER_ORIGIN"

    android:protectionLevel="signature" />



  <!-- Permissions needed for badger count showing on launch icon. -->

  <!-- Permissions needed for badger count showing on launch icon. -->





  <!--for Samsung-->

  <!--for Samsung-->

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/app/calllog/LegacyVoicemailNotifier.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.dialer.common.LogUtil; 
import com.android.dialer.location.GeoUtil;

import com.android.dialer.location.GeoUtil;

import com.android.dialer.notification.DialerNotificationManager;

import com.android.dialer.notification.DialerNotificationManager;

import com.android.dialer.notification.NotificationChannelManager;

import com.android.dialer.notification.NotificationChannelManager;

import com.android.dialer.notification.VoicemailChannelUtils;

import com.android.dialer.phonenumberutil.PhoneNumberHelper;

import com.android.dialer.phonenumberutil.PhoneNumberHelper;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.theme.base.ThemeComponent;

import com.android.dialer.theme.base.ThemeComponent;
@@ -181,7 +182,8 @@ public final class LegacyVoicemailNotifier { 
    if (context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1) {

    if (context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1) {

      return NOTIFICATION_TAG;

      return NOTIFICATION_TAG;

    }

    }

    return NOTIFICATION_TAG_PREFIX + phoneAccountHandle.getId();

    return NOTIFICATION_TAG_PREFIX

        + VoicemailChannelUtils.getHashedPhoneAccountId(phoneAccountHandle);

  }

  }





  private LegacyVoicemailNotifier() {}

  private LegacyVoicemailNotifier() {}

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) {