diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-01-21 16:24:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-21 16:24:01 +0000 |
| commit | 3458e180cf1dab2be19d00758b64033061aa62d2 (patch) | |
| tree | 1eba28304864b382418414b46671ce7da6ea3d08 /core/java | |
| parent | 4196fc56bcee78eba4a204d80a62d9ad0c77022f (diff) | |
| parent | 11c4cc196de9dca3bfad711b1b9e4b779a72cc01 (diff) | |
| download | frameworks_base-3458e180cf1dab2be19d00758b64033061aa62d2.zip frameworks_base-3458e180cf1dab2be19d00758b64033061aa62d2.tar.gz frameworks_base-3458e180cf1dab2be19d00758b64033061aa62d2.tar.bz2 | |
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca
automerge: 11c4cc1
* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
Only hide cross profile disclosure when showing resolver.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/app/IntentForwarderActivity.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 9656a21..7c1308f 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -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); |