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

Commit c44755d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Create a new Bundle object if mExtras is null." into tm-qpr-dev am:... 

Merge "Create a new Bundle object if mExtras is null." into tm-qpr-dev am: 5abc2692 am: 836d445e

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



Change-Id: I08230811c13ad7fe0afc43d4ca67c95cc152fdaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45cfd525 836d445e

core/java/android/app/search/SearchAction.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public final class SearchAction implements Parcelable { 
    private final UserHandle mUserHandle;



    @Nullable

    private Bundle mExtras;

    private final Bundle mExtras;



    SearchAction(Parcel in) {

        mId = in.readString();
@@ -99,7 +99,7 @@ public final class SearchAction implements Parcelable { 
        mPendingIntent = pendingIntent;

        mIntent = intent;

        mUserHandle = userHandle;

        mExtras = extras;

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



        if (mPendingIntent == null && mIntent == null) {

            throw new IllegalStateException("At least one type of intent should be available.");

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public final class SearchTarget implements Parcelable { 
        mShortcutInfo = shortcutInfo;

        mAppWidgetProviderInfo = appWidgetProviderInfo;

        mSliceUri = sliceUri;

        mExtras = extras;

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



        int published = 0;

        if (mSearchAction != null) published++;