commit | 0adb17700cedde8e95a40ae48aa0b2559448d388 | [log] [tgz] |
---|---|---|
author | Elis Elliott <eliselliott@google.com> | Wed Mar 09 12:28:53 2022 +0000 |
committer | Elis Elliott <eliselliott@google.com> | Wed Mar 09 12:28:53 2022 +0000 |
tree | f997d5437c5f1e80303ce6b304abe337d95197d9 | |
parent | c640ee83fb6a914d6203514f324116fac62168d5 [diff] |
Don't show intent picker when using camera attachment in a Managed Profile. Fixes: 195300298 Test: Manual - Follow steps from comment #1 in the bug. Change-Id: Ia58efda81b3cdb9b9f4d2a36cdc4af120d48e010
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)