diff options
| author | 2023-05-09 16:18:33 +0000 | |
|---|---|---|
| committer | 2023-05-09 16:18:33 +0000 | |
| commit | 750017a206395df2fa4c7938eb4d71b04e92b59c (patch) | |
| tree | 9ba831131769dbefdd5c137f35995965b1958530 /java/tests/src | |
| parent | 1c8def6432040145150c87ef8794bfcb739c84d6 (diff) | |
| parent | abca6ddcaf567958a3e4cd07835be898d60d2d17 (diff) | |
Merge "Make app-provided chooser targets only show in the default profile" into udc-dev am: abca6ddcaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23083427
Change-Id: I4cdbfe154dd9ecb5526a80e3781966144442d5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/tests/src')
| -rw-r--r-- | java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 317e2815..6ba67fa7 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -1627,7 +1627,8 @@ public class UnbundledChooserActivityTest { // We need app targets for direct targets to get displayed List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2); - setupResolverControllers(resolvedComponentInfos); + setupResolverControllers(resolvedComponentInfos, resolvedComponentInfos); + markWorkProfileUserAvailable(); // set caller-provided target Intent chooserIntent = Intent.createChooser(createSendTextIntent(), null); @@ -1683,6 +1684,17 @@ public class UnbundledChooserActivityTest { "The display label must match", activeAdapter.getItem(0).getDisplayLabel(), is(callerTargetLabel)); + + // Switch to work profile and ensure that the target *doesn't* show up there. + onView(withText(R.string.resolver_work_tab)).perform(click()); + waitForIdle(); + + for (int i = 0; i < activity.getWorkListAdapter().getCount(); i++) { + assertThat( + "Chooser target should not show up in opposite profile", + activity.getWorkListAdapter().getItem(i).getDisplayLabel(), + not(callerTargetLabel)); + } } @Test |