From 85b632c71bf7e1cbf521558379d7676abdfd7d2b Mon Sep 17 00:00:00 2001
From: Anushree Ganjam <ganjam@google.com>
Date: Tue, 21 Jun 2022 18:39:55 +0000
Subject: Create a new Bundle object if mExtras is null.

Bug: 236191017
Test: Manual
Change-Id: I00d925e243335c447e1bb7513148f8735d160c0e
---
 core/java/android/app/search/SearchAction.java | 4 ++--
 core/java/android/app/search/SearchTarget.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/android/app/search/SearchAction.java b/core/java/android/app/search/SearchAction.java
index 9e40e7ebaef0..0c4508a4fb8d 100644
--- a/core/java/android/app/search/SearchAction.java
+++ b/core/java/android/app/search/SearchAction.java
@@ -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.");
diff --git a/core/java/android/app/search/SearchTarget.java b/core/java/android/app/search/SearchTarget.java
index a590a5d7b767..a3874f7cb007 100644
--- a/core/java/android/app/search/SearchTarget.java
+++ b/core/java/android/app/search/SearchTarget.java
@@ -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++;
-- 
cgit v1.2.3-59-g8ed1b