Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952f9c5f authored by Elis Elliott's avatar Elis Elliott Committed by Automerger Merge Worker
Browse files

Merge "Don't show intent picker when using camera attachment in a Managed... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135625

Change-Id: I0b42a98c246dcfcd55832579f9338baff42338f1
parents 1b79e1df fd45ea35

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

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public class DefaultCrossProfileIntentFiltersUtils { 
    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)