Merge "API: Suppress existing NullableCollections lints (S edition, die zweite)" into sc-dev (f1aaec7b) · Commits · e / os / android_frameworks_base

core/java/android/app/smartspace/SmartspaceAction.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app.smartspace;

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.app.smartspace;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.os.Bundle;
		@@ -98,6 +99,7 @@ public final class SmartspaceConfig implements Parcelable {
		}

		@Nullable
		@SuppressLint("NullableCollection")
		public Bundle getExtras() {
		return mExtras;
		}
		@@ -186,7 +188,7 @@ public final class SmartspaceConfig implements Parcelable {
		* Used to send a bundle containing extras for the {@link SmartspaceConfig}.
		*/
		@NonNull
		public Builder setExtras(@NonNull Bundle extras) {
		public Builder setExtras(@SuppressLint("NullableCollection") @NonNull Bundle extras) {
		this.mExtras = extras;
		return this;
		}