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

Commit f38f2c7d authored by Mehdi Alizadeh's avatar Mehdi Alizadeh
Browse files

Adds icon URI field to shortcutInfo 

Bug: 143106625
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10

Change-Id: I9a4bd2206084a20977a90ba13e3db8a76096910c
parent ccd4db5e

core/java/android/content/pm/ShortcutInfo.java

+47 −2
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ public final class ShortcutInfo implements Parcelable { 
    /** @hide */

    public static final int FLAG_CACHED = 1 << 14;



    /** @hide */

    public static final int FLAG_HAS_ICON_URI = 1 << 15;



    /** @hide */

    @IntDef(flag = true, prefix = { "FLAG_" }, value = {

            FLAG_DYNAMIC,
@@ -139,6 +142,7 @@ public final class ShortcutInfo implements Parcelable { 
            FLAG_SHADOW,

            FLAG_LONG_LIVED,

            FLAG_CACHED,

            FLAG_HAS_ICON_URI,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ShortcutFlags {}
@@ -400,6 +404,9 @@ public final class ShortcutInfo implements Parcelable { 


    private String mIconResName;



    // Internal use only.

    private String mIconUri;



    // Internal use only.

    @Nullable

    private String mBitmapPath;
@@ -554,6 +561,7 @@ public final class ShortcutInfo implements Parcelable { 
            if ((cloneFlags & CLONE_REMOVE_ICON) == 0) {

                mIcon = source.mIcon;

                mBitmapPath = source.mBitmapPath;

                mIconUri = source.mIconUri;

            }



            mTitle = source.mTitle;
@@ -856,6 +864,7 @@ public final class ShortcutInfo implements Parcelable { 
            mIconResId = 0;

            mIconResName = null;

            mBitmapPath = null;

            mIconUri = null;

        }

        if (source.mTitle != null) {

            mTitle = source.mTitle;
@@ -916,6 +925,8 @@ public final class ShortcutInfo implements Parcelable { 
            case Icon.TYPE_RESOURCE:

            case Icon.TYPE_BITMAP:

            case Icon.TYPE_ADAPTIVE_BITMAP:

            case Icon.TYPE_URI:

            case Icon.TYPE_URI_ADAPTIVE_BITMAP:

                break; // OK

            default:

                throw getInvalidIconException();
@@ -1792,6 +1803,15 @@ public final class ShortcutInfo implements Parcelable { 
        return hasFlags(FLAG_HAS_ICON_RES);

    }



    /**

     * Return whether a shortcut's icon is provided via a URI.

     *

     * @hide internal/unit tests only

     */

    public boolean hasIconUri() {

        return hasFlags(FLAG_HAS_ICON_URI);

    }



    /** @hide */

    public boolean hasStringResources() {

        return (mTitleResId != 0) || (mTextResId != 0) || (mDisabledMessageResId != 0);
@@ -1911,6 +1931,19 @@ public final class ShortcutInfo implements Parcelable { 
        return mIconResId;

    }



    /** @hide */

    public void setIconUri(String iconUri) {

        mIconUri = iconUri;

    }



    /**

     * Get the Uri for the icon, valid only when {@link #hasIconUri()} } is true.

     * @hide internal / tests only.

     */

    public String getIconUri() {

        return mIconUri;

    }



    /**

     * Bitmap path.  Note this will be null even if {@link #hasIconFile()} is set when the save

     * is pending.  Use {@link #isIconPendingSave()} to check it.
@@ -2062,6 +2095,7 @@ public final class ShortcutInfo implements Parcelable { 


        mPersons = source.readParcelableArray(cl, Person.class);

        mLocusId = source.readParcelable(cl);

        mIconUri = source.readString();

    }



    @Override
@@ -2112,6 +2146,7 @@ public final class ShortcutInfo implements Parcelable { 


        dest.writeParcelableArray(mPersons, flags);

        dest.writeParcelable(mLocusId, flags);

        dest.writeString(mIconUri);

    }



    public static final @android.annotation.NonNull Creator<ShortcutInfo> CREATOR =
@@ -2203,6 +2238,12 @@ public final class ShortcutInfo implements Parcelable { 
        if (hasIconResource()) {

            sb.append("Ic-r");

        }

        if (hasIconUri()) {

            sb.append("Ic-u");

        }

        if (hasAdaptiveBitmap()) {

            sb.append("Ic-a");

        }

        if (hasKeyFieldsOnly()) {

            sb.append("Key");

        }
@@ -2325,6 +2366,9 @@ public final class ShortcutInfo implements Parcelable { 


            sb.append(", bitmapPath=");

            sb.append(mBitmapPath);



            sb.append(", iconUri=");

            sb.append(mIconUri);

        }



        if (mLocusId != null) {
@@ -2343,8 +2387,8 @@ public final class ShortcutInfo implements Parcelable { 
            CharSequence disabledMessage, int disabledMessageResId, String disabledMessageResName,

            Set<String> categories, Intent[] intentsWithExtras, int rank, PersistableBundle extras,

            long lastChangedTimestamp,

            int flags, int iconResId, String iconResName, String bitmapPath, int disabledReason,

            Person[] persons, LocusId locusId) {

            int flags, int iconResId, String iconResName, String bitmapPath, String iconUri,

            int disabledReason, Person[] persons, LocusId locusId) {

        mUserId = userId;

        mId = id;

        mPackageName = packageName;
@@ -2369,6 +2413,7 @@ public final class ShortcutInfo implements Parcelable { 
        mIconResId = iconResId;

        mIconResName = iconResName;

        mBitmapPath = bitmapPath;

        mIconUri = iconUri;

        mDisabledReason = disabledReason;

        mPersons = persons;

        mLocusId = locusId;

services/core/java/com/android/server/pm/ShortcutBitmapSaver.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.util.Log; 
import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;

import com.android.server.pm.ShortcutService.FileOutputStreamWithPath;



import libcore.io.IoUtils;
@@ -150,9 +149,10 @@ public class ShortcutBitmapSaver { 
        shortcut.setIconResourceId(0);

        shortcut.setIconResName(null);

        shortcut.setBitmapPath(null);

        shortcut.setIconUri(null);

        shortcut.clearFlags(ShortcutInfo.FLAG_HAS_ICON_FILE |

                ShortcutInfo.FLAG_ADAPTIVE_BITMAP | ShortcutInfo.FLAG_HAS_ICON_RES |

                ShortcutInfo.FLAG_ICON_FILE_PENDING_SAVE);

                ShortcutInfo.FLAG_ICON_FILE_PENDING_SAVE | ShortcutInfo.FLAG_HAS_ICON_URI);

    }



    public void saveBitmapLocked(ShortcutInfo shortcut,

services/core/java/com/android/server/pm/ShortcutPackage.java

+20 −5
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
    private static final String ATTR_ICON_RES_ID = "icon-res";

    private static final String ATTR_ICON_RES_NAME = "icon-resname";

    private static final String ATTR_BITMAP_PATH = "bitmap-path";

    private static final String ATTR_ICON_URI = "icon-uri";

    private static final String ATTR_LOCUS_ID = "locus-id";



    private static final String ATTR_PERSON_NAME = "name";
@@ -1628,7 +1629,8 @@ class ShortcutPackage extends ShortcutPackageItem { 
            int flags = si.getFlags() &

                    ~(ShortcutInfo.FLAG_HAS_ICON_FILE | ShortcutInfo.FLAG_HAS_ICON_RES

                            | ShortcutInfo.FLAG_ICON_FILE_PENDING_SAVE

                            | ShortcutInfo.FLAG_DYNAMIC);

                            | ShortcutInfo.FLAG_DYNAMIC

                            | ShortcutInfo.FLAG_HAS_ICON_URI | ShortcutInfo.FLAG_ADAPTIVE_BITMAP);

            ShortcutService.writeAttr(out, ATTR_FLAGS, flags);



            // Set the publisher version code at every backup.
@@ -1646,6 +1648,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
            ShortcutService.writeAttr(out, ATTR_ICON_RES_ID, si.getIconResourceId());

            ShortcutService.writeAttr(out, ATTR_ICON_RES_NAME, si.getIconResName());

            ShortcutService.writeAttr(out, ATTR_BITMAP_PATH, si.getBitmapPath());

            ShortcutService.writeAttr(out, ATTR_ICON_URI, si.getIconUri());

        }



        if (shouldBackupDetails) {
@@ -1764,6 +1767,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
        int iconResId;

        String iconResName;

        String bitmapPath;

        String iconUri;

        final String locusIdString;

        int backupVersionCode;

        ArraySet<String> categories = null;
@@ -1791,6 +1795,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
        iconResId = (int) ShortcutService.parseLongAttribute(parser, ATTR_ICON_RES_ID);

        iconResName = ShortcutService.parseStringAttribute(parser, ATTR_ICON_RES_NAME);

        bitmapPath = ShortcutService.parseStringAttribute(parser, ATTR_BITMAP_PATH);

        iconUri = ShortcutService.parseStringAttribute(parser, ATTR_ICON_URI);

        locusIdString = ShortcutService.parseStringAttribute(parser, ATTR_LOCUS_ID);



        final int outerDepth = parser.getDepth();
@@ -1866,8 +1871,8 @@ class ShortcutPackage extends ShortcutPackageItem { 
                categories,

                intents.toArray(new Intent[intents.size()]),

                rank, extras, lastChangedTimestamp, flags,

                iconResId, iconResName, bitmapPath, disabledReason,

                persons.toArray(new Person[persons.size()]), locusId);

                iconResId, iconResName, bitmapPath, iconUri,

                disabledReason, persons.toArray(new Person[persons.size()]), locusId);

    }



    private static Intent parseIntent(XmlPullParser parser)
@@ -1991,16 +1996,26 @@ class ShortcutPackage extends ShortcutPackageItem { 
                Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()

                        + " still has an icon");

            }

            if (si.hasAdaptiveBitmap() && !si.hasIconFile()) {

            if (si.hasAdaptiveBitmap() && !(si.hasIconFile() || si.hasIconUri())) {

                failed = true;

                Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()

                    + " has adaptive bitmap but was not saved to a file.");

                        + " has adaptive bitmap but was not saved to a file nor has icon uri.");

            }

            if (si.hasIconFile() && si.hasIconResource()) {

                failed = true;

                Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()

                        + " has both resource and bitmap icons");

            }

            if (si.hasIconFile() && si.hasIconUri()) {

                failed = true;

                Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()

                        + " has both url and bitmap icons");

            }

            if (si.hasIconUri() && si.hasIconResource()) {

                failed = true;

                Log.e(TAG_VERIFY, "Package " + getPackageName() + ": shortcut " + si.getId()

                        + " has both url and resource icons");

            }

            if (si.isEnabled()

                    != (si.getDisabledReason() == ShortcutInfo.DISABLED_REASON_NOT_DISABLED)) {

                failed = true;

services/core/java/com/android/server/pm/ShortcutParser.java

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ public class ShortcutParser { 
                iconResId,

                null, // icon res name

                null, // bitmap path

                null, // icon Url

                disabledReason,

                null /* persons */,

                null /* locusId */);

services/core/java/com/android/server/pm/ShortcutService.java

+10 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ public class ShortcutService extends IShortcutService.Stub { 
    }



    void saveIconAndFixUpShortcutLocked(ShortcutInfo shortcut) {

        if (shortcut.hasIconFile() || shortcut.hasIconResource()) {

        if (shortcut.hasIconFile() || shortcut.hasIconResource() || shortcut.hasIconUri()) {

            return;

        }
@@ -1438,6 +1438,15 @@ public class ShortcutService extends IShortcutService.Stub { 
                        shortcut.addFlags(ShortcutInfo.FLAG_HAS_ICON_RES);

                        return;

                    }

                    case Icon.TYPE_URI:

                        shortcut.setIconUri(icon.getUriString());

                        shortcut.addFlags(ShortcutInfo.FLAG_HAS_ICON_URI);

                        return;

                    case Icon.TYPE_URI_ADAPTIVE_BITMAP:

                        shortcut.setIconUri(icon.getUriString());

                        shortcut.addFlags(ShortcutInfo.FLAG_HAS_ICON_URI

                                | ShortcutInfo.FLAG_ADAPTIVE_BITMAP);

                        return;

                    case Icon.TYPE_BITMAP:

                        bitmap = icon.getBitmap(); // Don't recycle in this case.

                        break;