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

Merge "API: Suppress existing NullableCollections lints (S edition, die zweite)" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-04 09:04:23 +00:00
committed by Android (Google) Code Review
parent 6344e2dbe8 17e3e829bf
commit f1aaec7b4b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/smartspace/SmartspaceAction.java
View File

@@ -18,6 +18,7 @@ package android.app.smartspace;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
@@ -171,6 +172,7 @@ public final class SmartspaceAction implements Parcelable {
/** /**
* Returns the extra bundle for this object. * Returns the extra bundle for this object.
*/ */
@SuppressLint("NullableCollection")
public @Nullable Bundle getExtras() { public @Nullable Bundle getExtras() {
return mExtras; return mExtras;
} }
@@ -334,7 +336,7 @@ public final class SmartspaceAction implements Parcelable {
* Sets the extra. * Sets the extra.
*/ */
@NonNull @NonNull
public Builder setExtras(@Nullable Bundle extras) { public Builder setExtras(@SuppressLint("NullableCollection") @Nullable Bundle extras) {
mExtras = extras; mExtras = extras;
return this; return this;
} }

4
core/java/android/app/smartspace/SmartspaceConfig.java
View File

@@ -17,6 +17,7 @@ package android.app.smartspace;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -98,6 +99,7 @@ public final class SmartspaceConfig implements Parcelable {
} }
@Nullable @Nullable
@SuppressLint("NullableCollection")
public Bundle getExtras() { public Bundle getExtras() {
return mExtras; return mExtras;
} }
@@ -186,7 +188,7 @@ public final class SmartspaceConfig implements Parcelable {
* Used to send a bundle containing extras for the {@link SmartspaceConfig}. * Used to send a bundle containing extras for the {@link SmartspaceConfig}.
*/ */
@NonNull @NonNull
public Builder setExtras(@NonNull Bundle extras) { public Builder setExtras(@SuppressLint("NullableCollection") @NonNull Bundle extras) {
this.mExtras = extras; this.mExtras = extras;
return this; return this;
} }