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

Commit 6186ae60 authored by Katsiaryna Naliuka's avatar Katsiaryna Naliuka Committed by Android (Google) Code Review
Browse files

Merge "Passing shared media URI along with the shared media type to the App... 

Merge "Passing shared media URI along with the shared media type to the App Predictor. The URI can be used to generate app/direct share targets by the app prediction services."
parents bbef27bc 66cd0568

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

+22 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Message;

import android.os.Parcelable;

import android.os.PatternMatcher;

import android.os.Process;

import android.os.RemoteException;

import android.os.ResultReceiver;
@@ -1650,10 +1651,28 @@ public class ChooserActivity extends ResolverActivity implements 
        try {

            final Intent intent = getTargetIntent();

            String dataString = intent.getDataString();

            if (TextUtils.isEmpty(dataString)) {

                dataString = intent.getType();

            }

            if (!TextUtils.isEmpty(dataString)) {

                return new IntentFilter(intent.getAction(), dataString);

            }

            IntentFilter intentFilter = new IntentFilter(intent.getAction(), intent.getType());

            List<Uri> contentUris = new ArrayList<>();

            if (Intent.ACTION_SEND.equals(intent.getAction())) {

                Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);

                if (uri != null) {

                    contentUris.add(uri);

                }

            } else {

                List<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);

                if (uris != null) {

                    contentUris.addAll(uris);

                }

            }

            for (Uri uri : contentUris) {

                intentFilter.addDataScheme(uri.getScheme());

                intentFilter.addDataAuthority(uri.getAuthority(), null);

                intentFilter.addDataPath(uri.getPath(), PatternMatcher.PATTERN_LITERAL);

            }

            return intentFilter;

        } catch (Exception e) {

            Log.e(TAG, "failed to get target intent filter " + e);

            return null;