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

Commit 1c1ae064 authored by Abhijeet Kaur's avatar Abhijeet Kaur
Browse files

Revert "Enable PICK_IMAGES intent from personal to work profile" 

This reverts commit 365e4fc6.

Reason for revert: This was a temporary fix, and the long term GEM fix is now merged.

Change-Id: I8270791e66dc11de6bedaeffa01061c4311b07af
parent 365e4fc6

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

+0 −26
Original line number Diff line number Diff line
@@ -199,30 +199,6 @@ public class DefaultCrossProfileIntentFiltersUtils { 
                    .addDataType("video/*")

                    .build();



    // TODO(b/199068419): Remove once GEM enables the intent for Googlers

    /** Pick images can be forwarded to work profile. */

    private static final DefaultCrossProfileIntentFilter ACTION_PICK_IMAGES_TO_PROFILE =

            new DefaultCrossProfileIntentFilter.Builder(

                    DefaultCrossProfileIntentFilter.Direction.TO_PROFILE,

                    /* flags= */ 0,

                    /* letsPersonalDataIntoProfile= */ true)

                    .addAction(MediaStore.ACTION_PICK_IMAGES)

                    .addCategory(Intent.CATEGORY_DEFAULT)

                    .build();

    // TODO(b/199068419): Remove once GEM enables the intent for Googlers

    /** Pick images can be forwarded to work profile. */

    private static final DefaultCrossProfileIntentFilter

            ACTION_PICK_IMAGES_WITH_DATA_TYPES_TO_PROFILE =

            new DefaultCrossProfileIntentFilter.Builder(

                    DefaultCrossProfileIntentFilter.Direction.TO_PROFILE,

                    /* flags= */ 0,

                    /* letsPersonalDataIntoProfile= */ true)

                    .addAction(MediaStore.ACTION_PICK_IMAGES)

                    .addCategory(Intent.CATEGORY_DEFAULT)

                    .addDataType("image/*")

                    .addDataType("video/*")

                    .build();



    /** Open document intent can be forwarded to parent user. */

    private static final DefaultCrossProfileIntentFilter OPEN_DOCUMENT =

            new DefaultCrossProfileIntentFilter.Builder(
@@ -336,8 +312,6 @@ public class DefaultCrossProfileIntentFiltersUtils { 
                ACTION_PICK_DATA,

                ACTION_PICK_IMAGES,

                ACTION_PICK_IMAGES_WITH_DATA_TYPES,

                ACTION_PICK_IMAGES_TO_PROFILE,

                ACTION_PICK_IMAGES_WITH_DATA_TYPES_TO_PROFILE,

                OPEN_DOCUMENT,

                GET_CONTENT,

                USB_DEVICE_ATTACHED,