commit fd45ea359bc01c7e33a7a68bb4cf30593096e3a0
author Elis Elliott <eliselliott@google.com> Thu Mar 24 10:19:34 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 24 10:19:34 2022 +0000
tree 9522d26badde9e9570c612ea6cdf0e7edf0e0678
parent d336b9ba57ed243d2580a979c196ff7f9ea15f7d
parent 0adb17700cedde8e95a40ae48aa0b2559448d388

Merge "Don't show intent picker when using camera attachment in a Managed Profile." into tm-dev

services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java

diff --git a/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java b/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java
index a3134a0..cac9323 100644
--- a/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java
+++ b/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java
@@ -246,7 +246,7 @@
     private static final DefaultCrossProfileIntentFilter MEDIA_CAPTURE =
             new DefaultCrossProfileIntentFilter.Builder(
                     DefaultCrossProfileIntentFilter.Direction.TO_PARENT,
-                    /* flags= */0,
+                    /* flags= */ ONLY_IF_NO_MATCH_FOUND,
                     /* letsPersonalDataIntoProfile= */ true)
                     .addAction(MediaStore.ACTION_IMAGE_CAPTURE)
                     .addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE)