Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 (12a7be98) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -56973,7 +56973,7 @@ package android.view.inputmethod {

		public final class InlineSuggestionsRequest implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.os.Bundle getExtras();
		method @NonNull public android.os.Bundle getExtras();
		method @NonNull public String getHostPackageName();
		method @NonNull public java.util.List<android.widget.inline.InlinePresentationSpec> getInlinePresentationSpecs();
		method public int getMaxSuggestionCount();
		@@ -61601,7 +61601,7 @@ package android.widget.inline {
		method public int describeContents();
		method @NonNull public android.util.Size getMaxSize();
		method @NonNull public android.util.Size getMinSize();
		method @Nullable public android.os.Bundle getStyle();
		method @NonNull public android.os.Bundle getStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.widget.inline.InlinePresentationSpec> CREATOR;
		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9533,7 +9533,7 @@ package android.service.autofill {
		public abstract class InlineSuggestionRenderService extends android.app.Service {
		ctor public InlineSuggestionRenderService();
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method @Nullable public android.os.Bundle onGetInlineSuggestionsRendererInfo();
		method @NonNull public android.os.Bundle onGetInlineSuggestionsRendererInfo();
		method @Nullable public android.view.View onRenderSuggestion(@NonNull android.service.autofill.InlinePresentation, int, int);
		method public final void startIntentSender(@NonNull android.content.IntentSender);
		field public static final String SERVICE_INTERFACE = "android.service.autofill.InlineSuggestionRenderService";

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3191,7 +3191,7 @@ package android.service.autofill {
		public abstract class InlineSuggestionRenderService extends android.app.Service {
		ctor public InlineSuggestionRenderService();
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method @Nullable public android.os.Bundle onGetInlineSuggestionsRendererInfo();
		method @NonNull public android.os.Bundle onGetInlineSuggestionsRendererInfo();
		method @Nullable public android.view.View onRenderSuggestion(@NonNull android.service.autofill.InlinePresentation, int, int);
		method public final void startIntentSender(@NonNull android.content.IntentSender);
		field public static final String SERVICE_INTERFACE = "android.service.autofill.InlineSuggestionRenderService";

core/java/android/service/autofill/InlineSuggestionRenderService.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -173,11 +173,12 @@ public abstract class InlineSuggestionRenderService extends Service {
		}

		/**
		* Returns the metadata about the renderer. Returns {@code null} if no metadata is provided.
		* Returns the metadata about the renderer. Returns {@code Bundle.Empty} if no metadata is
		* provided.
		*/
		@Nullable
		@NonNull
		public Bundle onGetInlineSuggestionsRendererInfo() {
		return null;
		return Bundle.EMPTY;
		}

		/**

core/java/android/view/inline/InlinePresentationSpec.java

+19 −19

Original line number	Diff line number	Diff line
		@@ -48,14 +48,14 @@ public final class InlinePresentationSpec implements Parcelable {
		private final Size mMaxSize;

		/**
		* The extras encoding the UI style information. Defaults to {@code null} in which case the
		* default system UI style will be used.
		* The extras encoding the UI style information. Defaults to {@code Bundle.EMPTY} in which case
		* the default system UI style will be used.
		*/
		@Nullable
		@NonNull
		private final Bundle mStyle;

		private static Bundle defaultStyle() {
		return null;
		return Bundle.EMPTY;
		}

		/** @hide */
		@@ -124,7 +124,7 @@ public final class InlinePresentationSpec implements Parcelable {
		/* package-private */ InlinePresentationSpec(
		@NonNull Size minSize,
		@NonNull Size maxSize,
		@Nullable Bundle style) {
		@NonNull Bundle style) {
		this.mMinSize = minSize;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMinSize);
		@@ -132,6 +132,8 @@ public final class InlinePresentationSpec implements Parcelable {
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMaxSize);
		this.mStyle = style;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mStyle);

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -155,11 +157,11 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		/**
		* The extras encoding the UI style information. Defaults to {@code null} in which case the
		* default system UI style will be used.
		* The extras encoding the UI style information. Defaults to {@code Bundle.EMPTY} in which case
		* the default system UI style will be used.
		*/
		@DataClass.Generated.Member
		public @Nullable Bundle getStyle() {
		public @NonNull Bundle getStyle() {
		return mStyle;
		}

		@@ -213,12 +215,9 @@ public final class InlinePresentationSpec implements Parcelable {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		byte flg = 0;
		if (mStyle != null) flg \|= 0x4;
		dest.writeByte(flg);
		dest.writeSize(mMinSize);
		dest.writeSize(mMaxSize);
		if (mStyle != null) dest.writeBundle(mStyle);
		dest.writeBundle(mStyle);
		}

		@Override
		@@ -232,10 +231,9 @@ public final class InlinePresentationSpec implements Parcelable {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		byte flg = in.readByte();
		Size minSize = (Size) in.readSize();
		Size maxSize = (Size) in.readSize();
		Bundle style = (flg & 0x4) == 0 ? null : in.readBundle();
		Bundle style = in.readBundle();

		this.mMinSize = minSize;
		com.android.internal.util.AnnotationValidations.validate(
		@@ -244,6 +242,8 @@ public final class InlinePresentationSpec implements Parcelable {
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMaxSize);
		this.mStyle = style;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mStyle);

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -271,7 +271,7 @@ public final class InlinePresentationSpec implements Parcelable {

		private @NonNull Size mMinSize;
		private @NonNull Size mMaxSize;
		private @Nullable Bundle mStyle;
		private @NonNull Bundle mStyle;

		private long mBuilderFieldsSet = 0L;

		@@ -296,8 +296,8 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		/**
		* The extras encoding the UI style information. Defaults to {@code null} in which case the
		* default system UI style will be used.
		* The extras encoding the UI style information. Defaults to {@code Bundle.EMPTY} in which case
		* the default system UI style will be used.
		*/
		@DataClass.Generated.Member
		public @NonNull Builder setStyle(@NonNull Bundle value) {
		@@ -333,10 +333,10 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		@DataClass.Generated(
		time = 1585634825103L,
		time = 1585691139012L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/view/inline/InlinePresentationSpec.java",
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nprivate final @android.annotation.Nullable android.os.Bundle mStyle\nprivate static android.os.Bundle defaultStyle()\npublic android.widget.inline.InlinePresentationSpec toWidget()\npublic static android.view.inline.InlinePresentationSpec fromWidget(android.widget.inline.InlinePresentationSpec)\npublic static java.util.List<android.view.inline.InlinePresentationSpec> fromWidgets(java.util.List<android.widget.inline.InlinePresentationSpec>)\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nprivate final @android.annotation.NonNull android.os.Bundle mStyle\nprivate static android.os.Bundle defaultStyle()\npublic android.widget.inline.InlinePresentationSpec toWidget()\npublic static android.view.inline.InlinePresentationSpec fromWidget(android.widget.inline.InlinePresentationSpec)\npublic static java.util.List<android.view.inline.InlinePresentationSpec> fromWidgets(java.util.List<android.widget.inline.InlinePresentationSpec>)\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
		@Deprecated
		private void __metadata() {}