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

Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev

Browse Source
This commit is contained in:
Kenny Guy
2015-01-21 16:13:21 +00:00
committed by Android (Google) Code Review
parent af69fcd0bd 2b43c73e66
commit 06ab0ca481
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/IntentForwarderActivity.java
View File

@@ -96,9 +96,12 @@ public class IntentForwarderActivity extends Activity {
final android.content.pm.ResolveInfo ri = getPackageManager().resolveActivityAsUser( final android.content.pm.ResolveInfo ri = getPackageManager().resolveActivityAsUser(
newIntent, MATCH_DEFAULT_ONLY, targetUserId); newIntent, MATCH_DEFAULT_ONLY, targetUserId);
// Only show a disclosure if this is a normal (non-OS) app // Don't show the disclosure if next activity is ResolverActivity or ChooserActivity
final boolean shouldShowDisclosure = // as those will already have shown work / personal as neccesary etc.
!UserHandle.isSameApp(ri.activityInfo.applicationInfo.uid, Process.SYSTEM_UID); final boolean shouldShowDisclosure = ri == null || ri.activityInfo == null ||
!"android".equals(ri.activityInfo.packageName) ||
!(ResolverActivity.class.getName().equals(ri.activityInfo.name)
|| ChooserActivity.class.getName().equals(ri.activityInfo.name));
try { try {
startActivityAsCaller(newIntent, null, targetUserId); startActivityAsCaller(newIntent, null, targetUserId);