Merge "Add missing nullability annotations." (9b361c26) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

api/system-current.txt

+4 −4

core/java/android/app/Vr2dDisplayProperties.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package android.app;		package android.app;

			import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	@@ -63,6 +65,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
	return result;		return result;
	}		}

			@NonNull
	@Override		@Override
	public String toString() {		public String toString() {
	return "Vr2dDisplayProperties{"		return "Vr2dDisplayProperties{"
	@@ -75,7 +78,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
	}		}

	@Override		@Override
	public boolean equals(Object o) {		public boolean equals(@Nullable Object o) {
	if (this == o) return true;		if (this == o) return true;
	if (o == null \|\| getClass() != o.getClass()) return false;		if (o == null \|\| getClass() != o.getClass()) return false;

core/java/android/app/backup/RestoreDescription.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.app.backup;		package android.app.backup;

			import android.annotation.NonNull;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	@@ -52,6 +53,7 @@ public class RestoreDescription implements Parcelable {
	/** This package's restore data is a tarball-type full data stream */		/** This package's restore data is a tarball-type full data stream */
	public static final int TYPE_FULL_STREAM = 2;		public static final int TYPE_FULL_STREAM = 2;

			@NonNull
	@Override		@Override
	public String toString() {		public String toString() {
	return "RestoreDescription{" + mPackageName + " : "		return "RestoreDescription{" + mPackageName + " : "

core/java/android/app/usage/CacheQuotaHint.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ public final class CacheQuotaHint implements Parcelable {
	}		}

	@Override		@Override
	public boolean equals(Object o) {		public boolean equals(@Nullable Object o) {
	if (o instanceof CacheQuotaHint) {		if (o instanceof CacheQuotaHint) {
	final CacheQuotaHint other = (CacheQuotaHint) o;		final CacheQuotaHint other = (CacheQuotaHint) o;
	return Objects.equals(mUuid, other.mUuid)		return Objects.equals(mUuid, other.mUuid)

Original line number	Original line	Diff line number	Diff line
	@@ -26836,7 +26836,7 @@ package android.media.tv {
	method public android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);		method public android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);
	method public android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);		method public android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);
	method public android.media.tv.TvTrackInfo.Builder setDescription(CharSequence);		method public android.media.tv.TvTrackInfo.Builder setDescription(CharSequence);
	method public android.media.tv.TvTrackInfo.Builder setEncrypted(boolean);		method @NonNull public android.media.tv.TvTrackInfo.Builder setEncrypted(boolean);
	method public android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);		method public android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);
	method public android.media.tv.TvTrackInfo.Builder setLanguage(String);		method public android.media.tv.TvTrackInfo.Builder setLanguage(String);
	method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte);		method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte);
	@@ -42142,7 +42142,7 @@ package android.telephony {

	public class CarrierConfigManager {		public class CarrierConfigManager {
	method @Nullable public android.os.PersistableBundle getConfig();		method @Nullable public android.os.PersistableBundle getConfig();
	method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(String, int);		method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(@NonNull String, int);
	method @Nullable public android.os.PersistableBundle getConfigForSubId(int);		method @Nullable public android.os.PersistableBundle getConfigForSubId(int);
	method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);		method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
	method public void notifyConfigChangedForSubId(int);		method public void notifyConfigChangedForSubId(int);

Original line number	Original line	Diff line number	Diff line
	@@ -695,7 +695,7 @@ package android.app.usage {
	}		}

	public static final class UsageEvents.Event {		public static final class UsageEvents.Event {
	method public String getNotificationChannelId();		method @Nullable public String getNotificationChannelId();
	field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc		field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc
	field public static final int NOTIFICATION_SEEN = 10; // 0xa		field public static final int NOTIFICATION_SEEN = 10; // 0xa
	field public static final int SLICE_PINNED = 14; // 0xe		field public static final int SLICE_PINNED = 14; // 0xe
	@@ -1661,7 +1661,7 @@ package android.hardware.location {
	method @Deprecated public void setMsgType(int);		method @Deprecated public void setMsgType(int);
	method @Deprecated public void setVersion(int);		method @Deprecated public void setVersion(int);
	method @Deprecated public void writeToParcel(android.os.Parcel, int);		method @Deprecated public void writeToParcel(android.os.Parcel, int);
	field @Deprecated public static final android.os.Parcelable.Creator<android.hardware.location.ContextHubMessage> CREATOR;		field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.hardware.location.ContextHubMessage> CREATOR;
	}		}

	public class ContextHubTransaction<T> {		public class ContextHubTransaction<T> {
	@@ -1749,7 +1749,7 @@ package android.hardware.location {
	method public int getMonitoringType();		method public int getMonitoringType();
	method public int getSourceTechnologies();		method public int getSourceTechnologies();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final android.os.Parcelable.Creator<android.hardware.location.GeofenceHardwareMonitorEvent> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.location.GeofenceHardwareMonitorEvent> CREATOR;
	}		}

	public final class GeofenceHardwareRequest {		public final class GeofenceHardwareRequest {
	@@ -1872,7 +1872,7 @@ package android.hardware.location {
	method public long getNanoAppId();		method public long getNanoAppId();
	method public boolean isBroadcastMessage();		method public boolean isBroadcastMessage();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final android.os.Parcelable.Creator<android.hardware.location.NanoAppMessage> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.location.NanoAppMessage> CREATOR;
	}		}

	public final class NanoAppState implements android.os.Parcelable {		public final class NanoAppState implements android.os.Parcelable {