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

Commit 82baea46 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "getInstalledDialerApplications should not count ForwardIntentToParent"... 

Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev am: 72befffc
am: c5145fa2

Change-Id: I4d7c7fbd530d1cc05679cdc4b7c044efb9d0ba40
parents 4b62d5eb c5145fa2

telecomm/java/android/telecom/DefaultDialerManager.java

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.net.Uri;

import android.os.Process;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -163,7 +164,10 @@ public class DefaultDialerManager { 


        for (ResolveInfo resolveInfo : resolveInfoList) {

            final ActivityInfo activityInfo = resolveInfo.activityInfo;

            if (activityInfo != null && !packageNames.contains(activityInfo.packageName)) {

            if (activityInfo != null

                    && !packageNames.contains(activityInfo.packageName)

                    // ignore cross profile intent handler

                    && resolveInfo.targetUserId == UserHandle.USER_CURRENT) {

                packageNames.add(activityInfo.packageName);

            }

        }