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

Commit 417b1599 authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

Sharesheet: be more defensive about un-unparcelable intents. 

Test: atest ChooserActivityTest
Bug: 194359789
Change-Id: I2fb0c0e120f048042dea499e1ffc126989e0e2d2
parent f0657fc4

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

+16 −10
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.BadParcelableException;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -109,6 +110,7 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC 


    // get annotations of content from intent.

    private void getContentAnnotations(Intent intent) {

        try {

            ArrayList<String> annotations = intent.getStringArrayListExtra(

                    Intent.EXTRA_CONTENT_ANNOTATIONS);

            if (annotations != null) {
@@ -121,6 +123,10 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC 
                    mAnnotations[i] = annotations.get(i);

                }

            }

        } catch (BadParcelableException e) {

            Log.i(TAG, "Couldn't unparcel intent annotations. Ignoring.");

            mAnnotations = new String[0];

        }

    }



    /**