Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-15 19:30:46 +00:00
committed by Android (Google) Code Review
parent b6ccff73dd 39198faea1
commit 72befffcbc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/DefaultDialerManager.java
View File

@@ -22,6 +22,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Process; import android.os.Process;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
@@ -163,7 +164,10 @@ public class DefaultDialerManager {
for (ResolveInfo resolveInfo : resolveInfoList) { for (ResolveInfo resolveInfo : resolveInfoList) {
final ActivityInfo activityInfo = resolveInfo.activityInfo; 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); packageNames.add(activityInfo.packageName);
} }
} }