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

Commit 99e08bc3 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Remove constraint inside SearchTarget to only allow one android... 

Merge "Remove constraint inside SearchTarget to only allow one android primitive to be set." into udc-dev
parents 6f773fa6 9d3fe9bd

core/java/android/app/search/SearchTarget.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -186,16 +186,6 @@ public final class SearchTarget implements Parcelable { 
        mAppWidgetProviderInfo = appWidgetProviderInfo;

        mAppWidgetProviderInfo = appWidgetProviderInfo;

        mSliceUri = sliceUri;

        mSliceUri = sliceUri;

        mExtras = extras != null ? extras : new Bundle();

        mExtras = extras != null ? extras : new Bundle();



        int published = 0;

        if (mSearchAction != null) published++;

        if (mShortcutInfo != null) published++;

        if (mAppWidgetProviderInfo != null) published++;

        if (mSliceUri != null) published++;

        if (published > 1) {

            throw new IllegalStateException("Only one of SearchAction, ShortcutInfo,"

                    + " AppWidgetProviderInfo, SliceUri can be assigned in a SearchTarget.");

        }

    }

    }





    /**

    /**