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

Commit 975318de authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Truncate ShortcutInfo Id" into udc-dev am: 2ab75a77 

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



Change-Id: I916b84eb506b26440987dce759e4d7a42bd618d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f26ba9d 2ab75a77

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

+17 −4
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.view.contentcapture.ContentCaptureContext; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;



import java.lang.IllegalArgumentException;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -285,6 +284,12 @@ public final class ShortcutInfo implements Parcelable { 
     */

    public static final int DISABLED_REASON_OTHER_RESTORE_ISSUE = 103;



    /**

     * The maximum length of Shortcut ID. IDs will be truncated at this limit.

     * @hide

     */

    public static final int MAX_ID_LENGTH = 1000;



    /** @hide */

    @IntDef(prefix = { "DISABLED_REASON_" }, value = {

            DISABLED_REASON_NOT_DISABLED,
@@ -477,8 +482,7 @@ public final class ShortcutInfo implements Parcelable { 


    private ShortcutInfo(Builder b) {

        mUserId = b.mContext.getUserId();



        mId = Preconditions.checkStringNotEmpty(b.mId, "Shortcut ID must be provided");

        mId = getSafeId(Preconditions.checkStringNotEmpty(b.mId, "Shortcut ID must be provided"));



        // Note we can't do other null checks here because SM.updateShortcuts() takes partial

        // information.
@@ -584,6 +588,14 @@ public final class ShortcutInfo implements Parcelable { 
        return ret;

    }



    @NonNull

    private static String getSafeId(@NonNull String id) {

        if (id.length() > MAX_ID_LENGTH) {

            return id.substring(0, MAX_ID_LENGTH);

        }

        return id;

    }



    /**

     * Throws if any of the mandatory fields is not set.

     *
@@ -2342,7 +2354,8 @@ public final class ShortcutInfo implements Parcelable { 
        final ClassLoader cl = getClass().getClassLoader();



        mUserId = source.readInt();

        mId = source.readString8();

        mId = getSafeId(Preconditions.checkStringNotEmpty(source.readString8(),

                "Shortcut ID must be provided"));

        mPackageName = source.readString8();

        mActivity = source.readParcelable(cl, android.content.ComponentName.class);

        mFlags = source.readInt();

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java

+9 −0
Original line number Diff line number Diff line
@@ -228,6 +228,15 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { 
                });

    }



    public void testShortcutIdTruncated() {

        ShortcutInfo si = new ShortcutInfo.Builder(getTestContext(),

                "s".repeat(Short.MAX_VALUE)).build();



        assertTrue(

                "id must be truncated to MAX_ID_LENGTH",

                si.getId().length() <= ShortcutInfo.MAX_ID_LENGTH);

    }



    public void testShortcutInfoParcel() {

        setCaller(CALLING_PACKAGE_1, USER_10);

        ShortcutInfo si = parceled(new ShortcutInfo.Builder(mClientContext)