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 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
This commit is contained in:
Kenny Guy
2015-01-21 16:17:03 +00:00
committed by android-build-merger
parent 45c5f9d195 06ab0ca481
commit 11c4cc196d
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(
newIntent, MATCH_DEFAULT_ONLY, targetUserId);
// Only show a disclosure if this is a normal (non-OS) app
final boolean shouldShowDisclosure =
!UserHandle.isSameApp(ri.activityInfo.applicationInfo.uid, Process.SYSTEM_UID);
// Don't show the disclosure if next activity is ResolverActivity or ChooserActivity
// as those will already have shown work / personal as neccesary etc.
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 {
startActivityAsCaller(newIntent, null, targetUserId);