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

Commit 6ae9f751 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I3d097d14,Idd6604e5 

* changes:
  Update preferred SIM SuggestionProvider
  Remove non call log dependencies on PhoneAccountUtil
parents 2b22f7d6 04306a75

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

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import com.android.dialer.calldetails.CallDetailsEntries; 
import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;

import com.android.dialer.calllogutils.PhoneAccountUtils;

import com.android.dialer.calllogutils.PhoneCallDetails;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;
@@ -91,6 +90,7 @@ import com.android.dialer.phonenumbercache.ContactInfo; 
import com.android.dialer.phonenumbercache.ContactInfoHelper;

import com.android.dialer.phonenumberutil.PhoneNumberHelper;

import com.android.dialer.spam.SpamComponent;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.util.PermissionsUtil;

import java.util.ArrayList;

import java.util.Map;
@@ -1020,7 +1020,7 @@ public class CallLogAdapter extends GroupingListAdapter 
    }



    final PhoneAccountHandle accountHandle =

        PhoneAccountUtils.getAccount(details.accountComponentName, details.accountId);

        TelecomUtil.composePhoneAccountHandle(details.accountComponentName, details.accountId);



    final boolean isVoicemailNumber = callLogCache.isVoicemailNumber(accountHandle, details.number);

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

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import android.telephony.PhoneNumberUtils; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import com.android.dialer.app.R;

import com.android.dialer.calllogutils.PhoneAccountUtils;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.notification.DialerNotificationManager;

import com.android.dialer.notification.NotificationChannelManager;

import com.android.dialer.telecom.TelecomUtil;



/** Shows a notification in the status bar for legacy vociemail. */

@TargetApi(VERSION_CODES.O)
@@ -137,7 +137,7 @@ public final class LegacyVoicemailNotifier { 
  @NonNull

  private static String getNotificationText(

      @NonNull Context context, PhoneAccountHandle handle, String voicemailNumber) {

    if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {

    if (TelecomUtil.getCallCapablePhoneAccounts(context).size() > 1) {

      TelecomManager telecomManager = context.getSystemService(TelecomManager.class);

      PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);

      return phoneAccount.getShortDescription().toString();

java/com/android/dialer/calllog/database/Coalescer.java

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.Ann 
import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;

import com.android.dialer.calllog.datasources.CallLogDataSource;

import com.android.dialer.calllog.datasources.DataSources;

import com.android.dialer.calllogutils.PhoneAccountUtils;

import com.android.dialer.common.Assert;

import com.android.dialer.compat.telephony.TelephonyManagerCompat;

import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;

import com.android.dialer.telecom.TelecomUtil;

import com.google.common.base.Preconditions;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

import com.google.protobuf.InvalidProtocolBufferException;
@@ -144,11 +144,11 @@ public class Coalescer { 
      DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) {

    // Don't combine rows which don't use the same phone account.

    PhoneAccountHandle phoneAccount1 =

        PhoneAccountUtils.getAccount(

        TelecomUtil.composePhoneAccountHandle(

            row1.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME),

            row1.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_ID));

    PhoneAccountHandle phoneAccount2 =

        PhoneAccountUtils.getAccount(

        TelecomUtil.composePhoneAccountHandle(

            row2.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME),

            row2.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_ID));

java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; 
import com.android.dialer.common.concurrent.ThreadUtil;

import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;

import com.android.dialer.storage.StorageComponent;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.theme.R;

import com.android.dialer.util.PermissionsUtil;

import com.google.common.collect.Iterables;
@@ -363,7 +364,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { 
      String phoneAccountComponentName,

      String phoneAccountId) {

    PhoneAccountHandle phoneAccountHandle =

        PhoneAccountUtils.getAccount(phoneAccountComponentName, phoneAccountId);

        TelecomUtil.composePhoneAccountHandle(phoneAccountComponentName, phoneAccountId);

    if (phoneAccountHandle == null) {

      return;

    }

java/com/android/dialer/calllog/ui/menu/Modules.java

+3 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import com.android.dialer.calldetails.CallDetailsActivity; 
import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.calllog.model.CoalescedRow;

import com.android.dialer.calllogutils.CallLogContactTypes;

import com.android.dialer.calllogutils.PhoneAccountUtils;

import com.android.dialer.contactactions.ContactActionModule;

import com.android.dialer.contactactions.DividerModule;

import com.android.dialer.contactactions.IntentModule;

import com.android.dialer.contactactions.SharedModules;

import com.android.dialer.dialercontact.DialerContact;

import com.android.dialer.telecom.TelecomUtil;

import java.util.ArrayList;

import java.util.List;
@@ -82,7 +82,8 @@ final class Modules { 
    }



    PhoneAccountHandle phoneAccountHandle =

        PhoneAccountUtils.getAccount(row.phoneAccountComponentName(), row.phoneAccountId());

        TelecomUtil.composePhoneAccountHandle(

            row.phoneAccountComponentName(), row.phoneAccountId());



    if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {

      // Add an audio call item for video calls. Clicking the top entry on the bottom sheet will