Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Enable PICK_IMAGES intent from personal to work profile""

Browse Source
This commit is contained in:
Abhijeet Kaur
2022-01-25 09:58:14 +00:00
committed by Android (Google) Code Review
parent 25cffbf7ea 1c1ae06418
commit a5287a32af
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java
View File

@@ -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,