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

Commit 488ba68c authored by twyen's avatar twyen Committed by android-build-merger
Browse files

Merge "Handle missing contact permission for preferred SIM" am: f765d94d 

am: 196a7943

Change-Id: I6c638352b938bd25895d237aa7d8f651d89925ec
parents 5eb108e5 196a7943

java/com/android/dialer/precall/impl/CallingAccountSelector.java

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim 
import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;

import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.util.PermissionsUtil;

import com.google.common.base.Optional;

import com.google.common.collect.ImmutableSet;

import java.util.ArrayList;
@@ -311,6 +312,12 @@ public class CallingAccountSelector implements PreCallAction { 
      if (!isPreferredSimEnabled(context)) {

        return result;

      }

      if (!PermissionsUtil.hasContactsReadPermissions(context)) {

        LogUtil.i(

            "CallingAccountSelector.PreferredAccountWorker.doInBackground",

            "missing READ_CONTACTS permission");

        return result;

      }

      result.dataId = getDataId(context, phoneNumber);

      if (result.dataId.isPresent()) {

        result.phoneAccountHandle = getPreferredAccount(context, result.dataId.get());