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

Commit 8e7b940f authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Add ClipData.addItem(Item, ContentResolver) 

Unlike the existing addItem(Item), this method updates
the MIME type list in the ClipDescription.

Bug: 28750744
Test: cts-tradefed ... -m CtsContentTestCases
  --test android.content.cts.ClipboardManagerTest
Change-Id: Ida0477267d1319a31a738dfd704c0af71928dd2f
parent 9cea6840

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7939,6 +7939,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8303,6 +8303,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7961,6 +7961,7 @@ package android.content { 
    ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);

    ctor public ClipData(android.content.ClipData);

    method public void addItem(android.content.ClipData.Item);

    method public void addItem(android.content.ClipData.Item, android.content.ContentResolver);

    method public int describeContents();

    method public android.content.ClipDescription getDescription();

    method public android.content.ClipData.Item getItemAt(int);

core/java/android/content/ClipData.java

+44 −4
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.text.TextUtils; 
import android.text.style.URLSpan;

import android.util.Log;



import com.android.internal.util.ArrayUtils;



import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;
@@ -762,6 +764,18 @@ public class ClipData implements Parcelable { 
    static public ClipData newUri(ContentResolver resolver, CharSequence label,

            Uri uri) {

        Item item = new Item(uri);

        String[] mimeTypes = getMimeTypes(resolver, uri);

        return new ClipData(label, mimeTypes, item);

    }



    /**

     * Finds all applicable MIME types for a given URI.

     *

     * @param resolver ContentResolver used to get information about the URI.

     * @param uri The URI.

     * @return Returns an array of MIME types.

     */

    private static String[] getMimeTypes(ContentResolver resolver, Uri uri) {

        String[] mimeTypes = null;

        if ("content".equals(uri.getScheme())) {

            String realType = resolver.getType(uri);
@@ -769,7 +783,7 @@ public class ClipData implements Parcelable { 
            if (realType != null) {

                if (mimeTypes == null) {

                    mimeTypes = new String[] { realType };

                } else {

                } else if (!ArrayUtils.contains(mimeTypes, realType)) {

                    String[] tmp = new String[mimeTypes.length + 1];

                    tmp[0] = realType;

                    System.arraycopy(mimeTypes, 0, tmp, 1, mimeTypes.length);
@@ -780,7 +794,7 @@ public class ClipData implements Parcelable { 
        if (mimeTypes == null) {

            mimeTypes = MIMETYPES_TEXT_URILIST;

        }

        return new ClipData(label, mimeTypes, item);

        return mimeTypes;

    }



    /**
@@ -811,8 +825,8 @@ public class ClipData implements Parcelable { 
     * Add a new Item to the overall ClipData container.

     * <p> This method will <em>not</em> update the list of available MIME types in the

     * {@link ClipDescription}. It should be used only when adding items which do not add new

     * MIME types to this clip. If this is not the case, {@link #ClipData(CharSequence, String[],

     * Item)} should be used with a complete list of MIME types.

     * MIME types to this clip. If this is not the case, use {@link #addItem(Item, ContentResolver)}

     * or call {@link #ClipData(CharSequence, String[], Item)} with a complete list of MIME types.

     * @param item Item to be added.

     */

    public void addItem(Item item) {
@@ -822,6 +836,32 @@ public class ClipData implements Parcelable { 
        mItems.add(item);

    }



    /**

     * Add a new Item to the overall ClipData container.

     * <p> Unlike {@link #addItem(Item)}, this method will update the list of available MIME types

     * in the {@link ClipDescription}.

     * @param item Item to be added.

     * @param resolver ContentResolver used to get information about the URI possibly contained in

     * the item.

     */

    public void addItem(Item item, ContentResolver resolver) {

        addItem(item);



        if (item.getHtmlText() != null) {

            mClipDescription.addMimeTypes(MIMETYPES_TEXT_HTML);

        } else if (item.getText() != null) {

            mClipDescription.addMimeTypes(MIMETYPES_TEXT_PLAIN);

        }



        if (item.getIntent() != null) {

            mClipDescription.addMimeTypes(MIMETYPES_TEXT_INTENT);

        }



        if (item.getUri() != null) {

            mClipDescription.addMimeTypes(getMimeTypes(resolver, item.getUri()));

        }

    }



    /** @hide */

    public Bitmap getIcon() {

        return mIcon;

core/java/android/content/ClipDescription.java

+34 −17
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.PersistableBundle; 
import android.text.TextUtils;



import java.util.ArrayList;

import java.util.Arrays;



/**

 * Meta-data describing the contents of a {@link ClipData}.  Provides enough
@@ -89,7 +90,7 @@ public class ClipDescription implements Parcelable { 




    final CharSequence mLabel;

    final String[] mMimeTypes;

    private final ArrayList<String> mMimeTypes;

    private PersistableBundle mExtras;



    /**
@@ -103,7 +104,7 @@ public class ClipDescription implements Parcelable { 
            throw new NullPointerException("mimeTypes is null");

        }

        mLabel = label;

        mMimeTypes = mimeTypes;

        mMimeTypes = new ArrayList<String>(Arrays.asList(mimeTypes));

    }



    /**
@@ -111,7 +112,7 @@ public class ClipDescription implements Parcelable { 
     */

    public ClipDescription(ClipDescription o) {

        mLabel = o.mLabel;

        mMimeTypes = o.mMimeTypes;

        mMimeTypes = new ArrayList<String>(o.mMimeTypes);

    }



    /**
@@ -155,8 +156,9 @@ public class ClipDescription implements Parcelable { 
     * matches the desired MIME type, else false.

     */

    public boolean hasMimeType(String mimeType) {

        for (int i=0; i<mMimeTypes.length; i++) {

            if (compareMimeTypes(mMimeTypes[i], mimeType)) {

        final int size = mMimeTypes.size();

        for (int i=0; i<size; i++) {

            if (compareMimeTypes(mMimeTypes.get(i), mimeType)) {

                return true;

            }

        }
@@ -173,12 +175,13 @@ public class ClipDescription implements Parcelable { 
     */

    public String[] filterMimeTypes(String mimeType) {

        ArrayList<String> array = null;

        for (int i=0; i<mMimeTypes.length; i++) {

            if (compareMimeTypes(mMimeTypes[i], mimeType)) {

        final int size = mMimeTypes.size();

        for (int i=0; i<size; i++) {

            if (compareMimeTypes(mMimeTypes.get(i), mimeType)) {

                if (array == null) {

                    array = new ArrayList<String>();

                }

                array.add(mMimeTypes[i]);

                array.add(mMimeTypes.get(i));

            }

        }

        if (array == null) {
@@ -193,14 +196,26 @@ public class ClipDescription implements Parcelable { 
     * Return the number of MIME types the clip is available in.

     */

    public int getMimeTypeCount() {

        return mMimeTypes.length;

        return mMimeTypes.size();

    }



    /**

     * Return one of the possible clip MIME types.

     */

    public String getMimeType(int index) {

        return mMimeTypes[index];

        return mMimeTypes.get(index);

    }



    /**

     * Add MIME types to the clip description.

     */

    void addMimeTypes(String[] mimeTypes) {

        for (int i=0; i!=mimeTypes.length; i++) {

            final String mimeType = mimeTypes[i];

            if (!mMimeTypes.contains(mimeType)) {

                mMimeTypes.add(mimeType);

            }

        }

    }



    /**
@@ -229,11 +244,12 @@ public class ClipDescription implements Parcelable { 
        if (mMimeTypes == null) {

            throw new NullPointerException("null mime types");

        }

        if (mMimeTypes.length <= 0) {

        final int size = mMimeTypes.size();

        if (size <= 0) {

            throw new IllegalArgumentException("must have at least 1 mime type");

        }

        for (int i=0; i<mMimeTypes.length; i++) {

            if (mMimeTypes[i] == null) {

        for (int i=0; i<size; i++) {

            if (mMimeTypes.get(i) == null) {

                throw new NullPointerException("mime type at " + i + " is null");

            }

        }
@@ -275,12 +291,13 @@ public class ClipDescription implements Parcelable { 
    /** @hide */

    public boolean toShortStringTypesOnly(StringBuilder b) {

        boolean first = true;

        for (int i=0; i<mMimeTypes.length; i++) {

        final int size = mMimeTypes.size();

        for (int i=0; i<size; i++) {

            if (!first) {

                b.append(' ');

            }

            first = false;

            b.append(mMimeTypes[i]);

            b.append(mMimeTypes.get(i));

        }

        return !first;

    }
@@ -293,13 +310,13 @@ public class ClipDescription implements Parcelable { 
    @Override

    public void writeToParcel(Parcel dest, int flags) {

        TextUtils.writeToParcel(mLabel, dest, flags);

        dest.writeStringArray(mMimeTypes);

        dest.writeStringList(mMimeTypes);

        dest.writePersistableBundle(mExtras);

    }



    ClipDescription(Parcel in) {

        mLabel = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        mMimeTypes = in.createStringArray();

        mMimeTypes = in.createStringArrayList();

        mExtras = in.readPersistableBundle();

    }