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 am: 72befffcbc

Browse Source 
am: c5145fa25a

Change-Id: I4d7c7fbd530d1cc05679cdc4b7c044efb9d0ba40
This commit is contained in:
Tony Mak
2017-09-15 19:51:23 +00:00
committed by android-build-merger
parent 4b62d5ebae c5145fa25a
commit 82baea4641
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.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);
}
}