Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-14 17:07:52 +00:00
committed by Android (Google) Code Review
parent 1ff91194a8 85b632c71b
commit 5abc26927b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/search/SearchAction.java
View File

@@ -67,7 +67,7 @@ public final class SearchAction implements Parcelable {
private final UserHandle mUserHandle; private final UserHandle mUserHandle;
@Nullable @Nullable
private Bundle mExtras; private final Bundle mExtras;
SearchAction(Parcel in) { SearchAction(Parcel in) {
mId = in.readString(); mId = in.readString();
@@ -99,7 +99,7 @@ public final class SearchAction implements Parcelable {
mPendingIntent = pendingIntent; mPendingIntent = pendingIntent;
mIntent = intent; mIntent = intent;
mUserHandle = userHandle; mUserHandle = userHandle;
mExtras = extras; mExtras = extras != null ? extras : new Bundle();
if (mPendingIntent == null && mIntent == null) { if (mPendingIntent == null && mIntent == null) {
throw new IllegalStateException("At least one type of intent should be available."); throw new IllegalStateException("At least one type of intent should be available.");

2
core/java/android/app/search/SearchTarget.java
View File

@@ -185,7 +185,7 @@ public final class SearchTarget implements Parcelable {
mShortcutInfo = shortcutInfo; mShortcutInfo = shortcutInfo;
mAppWidgetProviderInfo = appWidgetProviderInfo; mAppWidgetProviderInfo = appWidgetProviderInfo;
mSliceUri = sliceUri; mSliceUri = sliceUri;
mExtras = extras; mExtras = extras != null ? extras : new Bundle();
int published = 0; int published = 0;
if (mSearchAction != null) published++; if (mSearchAction != null) published++;