From 1c1ae064180f5b7244cc2b2bfe504863e639b953 Mon Sep 17 00:00:00 2001 From: Abhijeet Kaur Date: Mon, 24 Jan 2022 19:52:19 +0000 Subject: [PATCH] Revert "Enable PICK_IMAGES intent from personal to work profile" This reverts commit 365e4fc6bf31568dde15c4c06c6161892dc08fbe. Reason for revert: This was a temporary fix, and the long term GEM fix is now merged. Change-Id: I8270791e66dc11de6bedaeffa01061c4311b07af --- ...DefaultCrossProfileIntentFiltersUtils.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java b/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java index c96a67bd53594..117136ab982d6 100644 --- a/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java +++ b/services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java @@ -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,