Merge cherrypicks of ['googleplex-android-review.googlesource.com/22357084'] into tm-qpr2-release. am: 87725c3

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

Change-Id: Ic717b2b448c202dcab9c5f3d101ddba9932e21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Android Build Coastguard Worker

core/java/com/android/internal/app/ChooserActivity.java

@@ -21,7 +21,6 @@
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_PERSONAL;
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_WORK;
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
-import static android.content.ContentProvider.getUserIdFromUri;
 import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
 import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_WORK;
 
@@ -162,7 +161,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
  * The Chooser Activity handles intent resolution specifically for sharing intents -
@@ -1426,11 +1424,7 @@ private ViewGroup displayImageContentPreview(Intent targetIntent, LayoutInflater
 
         String action = targetIntent.getAction();
         if (Intent.ACTION_SEND.equals(action)) {
-            Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM, android.net.Uri.class);
-            if (!validForContentPreview(uri)) {
-                contentPreviewLayout.setVisibility(View.GONE);
-                return contentPreviewLayout;
-            }
+            Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM);
             imagePreview.findViewById(R.id.content_preview_image_1_large)
                     .setTransitionName(ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME);
             mPreviewCoord.loadUriIntoView(R.id.content_preview_image_1_large, uri, 0);
@@ -1440,7 +1434,7 @@ private ViewGroup displayImageContentPreview(Intent targetIntent, LayoutInflater
             List<Uri> uris = targetIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
             List<Uri> imageUris = new ArrayList<>();
             for (Uri uri : uris) {
-                if (validForContentPreview(uri) && isImageType(resolver.getType(uri))) {
+                if (isImageType(resolver.getType(uri))) {
                     imageUris.add(uri);
                 }
             }
@@ -1550,16 +1544,9 @@ private ViewGroup displayFileContentPreview(Intent targetIntent, LayoutInflater
         String action = targetIntent.getAction();
         if (Intent.ACTION_SEND.equals(action)) {
             Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (!validForContentPreview(uri)) {
-                contentPreviewLayout.setVisibility(View.GONE);
-                return contentPreviewLayout;
-            }
             loadFileUriIntoView(uri, contentPreviewLayout);
         } else {
             List<Uri> uris = targetIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-            uris = uris.stream()
-                    .filter(ChooserActivity::validForContentPreview)
-                    .collect(Collectors.toList());
             int uriCount = uris.size();
 
             if (uriCount == 0) {
@@ -1618,24 +1605,6 @@ private void loadFileUriIntoView(final Uri uri, final View parent) {
         }
     }
 
-    /**
-     * Indicate if the incoming content URI should be allowed.
-     *
-     * @param uri the uri to test
-     * @return true if the URI is allowed for content preview
-     */
-    private static boolean validForContentPreview(Uri uri) throws SecurityException {
-        if (uri == null) {
-            return false;
-        }
-        int userId = getUserIdFromUri(uri, UserHandle.USER_CURRENT);
-        if (userId != UserHandle.USER_CURRENT && userId != UserHandle.myUserId()) {
-            Log.e(TAG, "dropped invalid content URI belonging to user " + userId);
-            return false;
-        }
-        return true;
-    }
-
     @VisibleForTesting
     protected boolean isImageType(String mimeType) {
         return mimeType != null && mimeType.startsWith("image/");