From 1da3bde08d844d0faaee9a3ced4fead7f3e4d4eb Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Wed, 28 Aug 2019 13:01:05 -0700 Subject: [PATCH] Add missing nullability annotations. To prepare for enabling MissingNullability Metalava check this CL works on adding missing nullability issues that metalava flags if we tell it to flag new things since API 29. This is not a complete CL, mostly addresses public api and toString/equals for @SystemApi Exempt-From-Owner-Approval: Large scale nullability clean up Bug: 124515653 Test: make -j checkapi Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867 Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867 --- api/current.txt | 4 ++-- api/system-current.txt | 8 +++---- .../android/app/Vr2dDisplayProperties.java | 5 +++- .../app/backup/RestoreDescription.java | 2 ++ .../android/app/usage/CacheQuotaHint.java | 2 +- core/java/android/app/usage/UsageEvents.java | 2 ++ core/java/android/content/om/OverlayInfo.java | 4 +++- .../display/AmbientBrightnessDayStats.java | 4 +++- .../display/BrightnessConfiguration.java | 4 +++- .../android/hardware/hdmi/HdmiDeviceInfo.java | 5 +++- .../android/hardware/hdmi/HdmiPortInfo.java | 5 +++- .../hardware/location/ContextHubInfo.java | 2 ++ .../hardware/location/ContextHubMessage.java | 4 +++- .../GeofenceHardwareMonitorEvent.java | 4 +++- .../hardware/location/MemoryRegion.java | 2 ++ .../android/hardware/location/NanoApp.java | 2 ++ .../hardware/location/NanoAppFilter.java | 2 ++ .../location/NanoAppInstanceInfo.java | 1 + .../hardware/location/NanoAppMessage.java | 4 +++- .../hardware/radio/ProgramSelector.java | 6 +++-- .../android/hardware/radio/RadioManager.java | 24 ++++++++++++------- .../android/hardware/radio/RadioMetadata.java | 1 + .../hardware/soundtrigger/SoundTrigger.java | 4 +++- core/java/android/hardware/usb/UsbPort.java | 3 ++- .../android/hardware/usb/UsbPortStatus.java | 4 +++- core/java/android/net/IpSecManager.java | 1 + core/java/android/net/NetworkKey.java | 4 +++- core/java/android/net/RssiCurve.java | 5 +++- core/java/android/net/ScoredNetwork.java | 4 +++- .../android/net/StaticIpConfiguration.java | 3 ++- core/java/android/net/WebAddress.java | 2 ++ core/java/android/net/WifiKey.java | 5 +++- .../java/android/net/apf/ApfCapabilities.java | 4 +++- .../android/net/metrics/ApfProgramEvent.java | 4 +++- core/java/android/net/metrics/ApfStats.java | 4 +++- .../android/net/metrics/DhcpClientEvent.java | 4 +++- .../android/net/metrics/DhcpErrorEvent.java | 2 ++ .../android/net/metrics/IpManagerEvent.java | 5 +++- .../net/metrics/IpReachabilityEvent.java | 5 +++- .../android/net/metrics/NetworkEvent.java | 5 +++- core/java/android/net/metrics/RaEvent.java | 4 +++- .../net/metrics/ValidationProbeEvent.java | 4 +++- core/java/android/os/IncidentReportArgs.java | 2 ++ .../android/os/ServiceSpecificException.java | 2 ++ core/java/android/os/WorkSource.java | 6 +++-- .../printservice/PrintServiceInfo.java | 4 +++- .../android/provider/SearchIndexableData.java | 2 ++ .../provider/SearchIndexableResource.java | 2 ++ .../service/euicc/EuiccProfileInfo.java | 4 +++- .../service/notification/Adjustment.java | 2 ++ .../notification/NotificationStats.java | 5 +++- .../service/notification/SnoozeCriterion.java | 3 ++- .../service/resolver/ResolverTarget.java | 6 ++--- location/java/android/location/GpsClock.java | 2 ++ .../java/android/location/GpsMeasurement.java | 2 ++ .../location/GpsMeasurementsEvent.java | 1 + .../location/GpsNavigationMessage.java | 1 + .../location/GpsNavigationMessageEvent.java | 1 + .../android/location/LocationRequest.java | 2 ++ media/java/android/media/AudioFocusInfo.java | 3 ++- .../media/session/MediaSessionManager.java | 3 +-- .../android/media/tv/TvInputHardwareInfo.java | 3 +++ .../java/android/media/tv/TvStreamConfig.java | 5 +++- media/java/android/media/tv/TvTrackInfo.java | 1 + telecomm/java/android/telecom/AudioState.java | 5 +++- .../android/telephony/CallAttributes.java | 4 +++- .../java/android/telephony/CallQuality.java | 5 +++- .../telephony/CarrierConfigManager.java | 2 +- .../telephony/CarrierRestrictionRules.java | 1 + .../DataSpecificRegistrationInfo.java | 4 +++- .../android/telephony/LteVopsSupportInfo.java | 5 +++- .../telephony/NetworkRegistrationInfo.java | 3 ++- .../android/telephony/PhoneNumberRange.java | 4 +++- .../android/telephony/PreciseCallState.java | 5 +++- .../telephony/PreciseDataConnectionState.java | 3 ++- .../android/telephony/SubscriptionPlan.java | 2 +- .../android/telephony/TelephonyHistogram.java | 5 ++-- .../android/telephony/UiccAccessRule.java | 4 +++- .../java/android/telephony/UiccSlotInfo.java | 5 +++- .../telephony/data/DataCallResponse.java | 3 ++- .../android/telephony/data/DataProfile.java | 3 ++- .../telephony/euicc/EuiccNotification.java | 4 +++- .../telephony/euicc/EuiccRulesAuthTable.java | 4 ++-- .../telephony/ims/ImsCallForwardInfo.java | 1 + .../android/telephony/ims/ImsCallProfile.java | 2 +- .../telephony/ims/ImsConferenceState.java | 2 ++ .../telephony/ims/ImsExternalCallState.java | 1 + .../android/telephony/ims/ImsReasonInfo.java | 3 +++ .../java/android/telephony/ims/ImsSsData.java | 2 ++ .../java/android/telephony/ims/ImsSsInfo.java | 1 + .../telephony/ims/ImsStreamMediaProfile.java | 2 ++ .../ims/ImsSuppServiceNotification.java | 2 ++ .../ims/feature/CapabilityChangeRequest.java | 3 +++ .../telephony/ims/feature/MmTelFeature.java | 1 + .../ims/stub/ImsFeatureConfiguration.java | 5 +++- .../telephony/mbms/DownloadRequest.java | 3 ++- wifi/java/android/net/wifi/RttManager.java | 2 ++ .../wifi/WifiNetworkConnectionStatistics.java | 4 ++-- .../net/wifi/hotspot2/OsuProvider.java | 5 +++- .../android/net/wifi/rtt/RangingRequest.java | 3 ++- .../android/net/wifi/rtt/ResponderConfig.java | 3 ++- 101 files changed, 266 insertions(+), 85 deletions(-) diff --git a/api/current.txt b/api/current.txt index 70f3400fc917b..6d7cd6954c884 100755 --- a/api/current.txt +++ b/api/current.txt @@ -26836,7 +26836,7 @@ package android.media.tv { 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 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 setLanguage(String); method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte); @@ -42142,7 +42142,7 @@ package android.telephony { public class CarrierConfigManager { 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 public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle); method public void notifyConfigChangedForSubId(int); diff --git a/api/system-current.txt b/api/system-current.txt index bbb6e2431fd30..ecf7dedda6b5d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -695,7 +695,7 @@ package android.app.usage { } 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_SEEN = 10; // 0xa 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 setVersion(int); method @Deprecated public void writeToParcel(android.os.Parcel, int); - field @Deprecated public static final android.os.Parcelable.Creator CREATOR; + field @Deprecated @NonNull public static final android.os.Parcelable.Creator CREATOR; } public class ContextHubTransaction { @@ -1749,7 +1749,7 @@ package android.hardware.location { method public int getMonitoringType(); method public int getSourceTechnologies(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; + field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public final class GeofenceHardwareRequest { @@ -1872,7 +1872,7 @@ package android.hardware.location { method public long getNanoAppId(); method public boolean isBroadcastMessage(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; + field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public final class NanoAppState implements android.os.Parcelable { diff --git a/core/java/android/app/Vr2dDisplayProperties.java b/core/java/android/app/Vr2dDisplayProperties.java index e0b60e0dfab30..6273e9b66613d 100644 --- a/core/java/android/app/Vr2dDisplayProperties.java +++ b/core/java/android/app/Vr2dDisplayProperties.java @@ -16,6 +16,8 @@ package android.app; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -63,6 +65,7 @@ public final class Vr2dDisplayProperties implements Parcelable { return result; } + @NonNull @Override public String toString() { return "Vr2dDisplayProperties{" @@ -75,7 +78,7 @@ public final class Vr2dDisplayProperties implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; diff --git a/core/java/android/app/backup/RestoreDescription.java b/core/java/android/app/backup/RestoreDescription.java index 0250326e42f27..693fd0d18c8fa 100644 --- a/core/java/android/app/backup/RestoreDescription.java +++ b/core/java/android/app/backup/RestoreDescription.java @@ -16,6 +16,7 @@ package android.app.backup; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; 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 */ public static final int TYPE_FULL_STREAM = 2; + @NonNull @Override public String toString() { return "RestoreDescription{" + mPackageName + " : " diff --git a/core/java/android/app/usage/CacheQuotaHint.java b/core/java/android/app/usage/CacheQuotaHint.java index 1d5c2b05488ee..17fbdf7edaaa5 100644 --- a/core/java/android/app/usage/CacheQuotaHint.java +++ b/core/java/android/app/usage/CacheQuotaHint.java @@ -81,7 +81,7 @@ public final class CacheQuotaHint implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o instanceof CacheQuotaHint) { final CacheQuotaHint other = (CacheQuotaHint) o; return Objects.equals(mUuid, other.mUuid) diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java index 4864ece8ef52f..a38111ac7d919 100644 --- a/core/java/android/app/usage/UsageEvents.java +++ b/core/java/android/app/usage/UsageEvents.java @@ -16,6 +16,7 @@ package android.app.usage; import android.annotation.IntDef; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.content.res.Configuration; @@ -366,6 +367,7 @@ public final class UsageEvents implements Parcelable { * event is of type {@link #NOTIFICATION_INTERRUPTION}, otherwise it returns null; * @hide */ + @Nullable @SystemApi public String getNotificationChannelId() { return mNotificationChannelId; diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index dd550032df7c3..2884dcbdff0b7 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -18,6 +18,7 @@ package android.content.om; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Parcel; @@ -310,7 +311,7 @@ public final class OverlayInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -342,6 +343,7 @@ public final class OverlayInfo implements Parcelable { return true; } + @NonNull @Override public String toString() { return "OverlayInfo { overlay=" + packageName + ", target=" + targetPackageName + ", state=" diff --git a/core/java/android/hardware/display/AmbientBrightnessDayStats.java b/core/java/android/hardware/display/AmbientBrightnessDayStats.java index 1aa2557f92a2e..9d6e8ebd3d912 100644 --- a/core/java/android/hardware/display/AmbientBrightnessDayStats.java +++ b/core/java/android/hardware/display/AmbientBrightnessDayStats.java @@ -17,6 +17,7 @@ package android.hardware.display; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -136,7 +137,7 @@ public final class AmbientBrightnessDayStats implements Parcelable { }; @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -161,6 +162,7 @@ public final class AmbientBrightnessDayStats implements Parcelable { return result; } + @NonNull @Override public String toString() { StringBuilder bucketBoundariesString = new StringBuilder(); diff --git a/core/java/android/hardware/display/BrightnessConfiguration.java b/core/java/android/hardware/display/BrightnessConfiguration.java index 6d9ba778d09ac..8f0e32f907dd3 100644 --- a/core/java/android/hardware/display/BrightnessConfiguration.java +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -16,6 +16,7 @@ package android.hardware.display; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; @@ -75,6 +76,7 @@ public final class BrightnessConfiguration implements Parcelable { return 0; } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder("BrightnessConfiguration{["); @@ -105,7 +107,7 @@ public final class BrightnessConfiguration implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java index 48ea9a63e2d61..1711ad2b1fbed 100644 --- a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java +++ b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java @@ -16,6 +16,8 @@ package android.hardware.hdmi; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -458,6 +460,7 @@ public class HdmiDeviceInfo implements Parcelable { } } + @NonNull @Override public String toString() { StringBuffer s = new StringBuffer(); @@ -493,7 +496,7 @@ public class HdmiDeviceInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (!(obj instanceof HdmiDeviceInfo)) { return false; } diff --git a/core/java/android/hardware/hdmi/HdmiPortInfo.java b/core/java/android/hardware/hdmi/HdmiPortInfo.java index 1f0f45a91917f..8eca6626a6799 100644 --- a/core/java/android/hardware/hdmi/HdmiPortInfo.java +++ b/core/java/android/hardware/hdmi/HdmiPortInfo.java @@ -15,6 +15,8 @@ */ package android.hardware.hdmi; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -162,6 +164,7 @@ public final class HdmiPortInfo implements Parcelable { dest.writeInt(mMhlSupported ? 1 : 0); } + @NonNull @Override public String toString() { StringBuffer s = new StringBuffer(); @@ -174,7 +177,7 @@ public final class HdmiPortInfo implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof HdmiPortInfo)) { return false; } diff --git a/core/java/android/hardware/location/ContextHubInfo.java b/core/java/android/hardware/location/ContextHubInfo.java index 36123e3d4229c..2d592ca7214fb 100644 --- a/core/java/android/hardware/location/ContextHubInfo.java +++ b/core/java/android/hardware/location/ContextHubInfo.java @@ -15,6 +15,7 @@ */ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.hardware.contexthub.V1_0.ContextHub; import android.os.Parcel; @@ -247,6 +248,7 @@ public class ContextHubInfo implements Parcelable { return mChrePatchVersion; } + @NonNull @Override public String toString() { String retVal = ""; diff --git a/core/java/android/hardware/location/ContextHubMessage.java b/core/java/android/hardware/location/ContextHubMessage.java index f078ff9444c0a..6777c53940a65 100644 --- a/core/java/android/hardware/location/ContextHubMessage.java +++ b/core/java/android/hardware/location/ContextHubMessage.java @@ -16,6 +16,7 @@ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -127,7 +128,7 @@ public class ContextHubMessage implements Parcelable { out.writeByteArray(mData); } - public static final Parcelable.Creator CREATOR + public static final @NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public ContextHubMessage createFromParcel(Parcel in) { return new ContextHubMessage(in); @@ -138,6 +139,7 @@ public class ContextHubMessage implements Parcelable { } }; + @NonNull @Override public String toString() { int length = mData.length; diff --git a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java index 70792370ad25a..78cca9601a2df 100644 --- a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java +++ b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java @@ -16,6 +16,7 @@ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.location.Location; import android.os.Parcel; @@ -72,7 +73,7 @@ public class GeofenceHardwareMonitorEvent implements Parcelable { return mLocation; } - public static final Creator CREATOR = + public static final @NonNull Creator CREATOR = new Creator() { @Override public GeofenceHardwareMonitorEvent createFromParcel(Parcel source) { @@ -108,6 +109,7 @@ public class GeofenceHardwareMonitorEvent implements Parcelable { parcel.writeParcelable(mLocation, flags); } + @NonNull @Override public String toString() { return String.format( diff --git a/core/java/android/hardware/location/MemoryRegion.java b/core/java/android/hardware/location/MemoryRegion.java index 857434ea75b98..9b63c1978c060 100644 --- a/core/java/android/hardware/location/MemoryRegion.java +++ b/core/java/android/hardware/location/MemoryRegion.java @@ -16,6 +16,7 @@ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -78,6 +79,7 @@ public class MemoryRegion implements Parcelable{ return mIsExecutable; } + @NonNull @Override public String toString() { String mask = ""; diff --git a/core/java/android/hardware/location/NanoApp.java b/core/java/android/hardware/location/NanoApp.java index ded1bb8c4c447..6a3b032ee007f 100644 --- a/core/java/android/hardware/location/NanoApp.java +++ b/core/java/android/hardware/location/NanoApp.java @@ -15,6 +15,7 @@ */ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -366,6 +367,7 @@ public class NanoApp implements Parcelable { } }; + @NonNull @Override public String toString() { String retVal = "Id : " + mAppId; diff --git a/core/java/android/hardware/location/NanoAppFilter.java b/core/java/android/hardware/location/NanoAppFilter.java index 562065e208154..8a251f6027e9a 100644 --- a/core/java/android/hardware/location/NanoAppFilter.java +++ b/core/java/android/hardware/location/NanoAppFilter.java @@ -16,6 +16,7 @@ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -131,6 +132,7 @@ public class NanoAppFilter implements Parcelable { (versionsMatch(mVersionRestrictionMask, mAppVersion, info.getAppVersion())); } + @NonNull @Override public String toString() { return "nanoAppId: 0x" + Long.toHexString(mAppId) diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java index 2db6a794fe9c8..c7df31a3318aa 100644 --- a/core/java/android/hardware/location/NanoAppInstanceInfo.java +++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java @@ -219,6 +219,7 @@ public class NanoAppInstanceInfo implements Parcelable { } }; + @NonNull @Override public String toString() { String retVal = "handle : " + mHandle; diff --git a/core/java/android/hardware/location/NanoAppMessage.java b/core/java/android/hardware/location/NanoAppMessage.java index fec1f7148a1e9..0f89d660ac68d 100644 --- a/core/java/android/hardware/location/NanoAppMessage.java +++ b/core/java/android/hardware/location/NanoAppMessage.java @@ -15,6 +15,7 @@ */ package android.hardware.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -133,7 +134,7 @@ public final class NanoAppMessage implements Parcelable { out.writeByteArray(mMessageBody); } - public static final Creator CREATOR = + public static final @NonNull Creator CREATOR = new Creator() { @Override public NanoAppMessage createFromParcel(Parcel in) { @@ -146,6 +147,7 @@ public final class NanoAppMessage implements Parcelable { } }; + @NonNull @Override public String toString() { int length = mMessageBody.length; diff --git a/core/java/android/hardware/radio/ProgramSelector.java b/core/java/android/hardware/radio/ProgramSelector.java index 90d407ca3a96e..4fcc7408cafc2 100644 --- a/core/java/android/hardware/radio/ProgramSelector.java +++ b/core/java/android/hardware/radio/ProgramSelector.java @@ -485,6 +485,7 @@ public final class ProgramSelector implements Parcelable { return new ProgramSelector(programType, primary, secondary, null); } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder("ProgramSelector(type=").append(mProgramType) @@ -502,7 +503,7 @@ public final class ProgramSelector implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof ProgramSelector)) return false; ProgramSelector other = (ProgramSelector) obj; @@ -598,6 +599,7 @@ public final class ProgramSelector implements Parcelable { return mValue; } + @NonNull @Override public String toString() { return "Identifier(" + mType + ", " + mValue + ")"; @@ -609,7 +611,7 @@ public final class ProgramSelector implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof Identifier)) return false; Identifier other = (Identifier) obj; diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java index 8263bb8dfd2d9..c72bb379a9d1b 100644 --- a/core/java/android/hardware/radio/RadioManager.java +++ b/core/java/android/hardware/radio/RadioManager.java @@ -485,6 +485,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "ModuleProperties [mId=" + mId @@ -507,7 +508,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof ModuleProperties)) return false; ModuleProperties other = (ModuleProperties) obj; @@ -660,6 +661,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "BandDescriptor [mRegion=" + mRegion + ", mType=" + mType + ", mLowerLimit=" @@ -679,7 +681,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof BandDescriptor)) @@ -788,6 +790,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "FmBandDescriptor [ "+ super.toString() + " mStereo=" + mStereo @@ -808,7 +811,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!super.equals(obj)) @@ -877,6 +880,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "AmBandDescriptor [ "+ super.toString() + " mStereo=" + mStereo + "]"; @@ -891,7 +895,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!super.equals(obj)) @@ -997,6 +1001,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "BandConfig [ " + mDescriptor.toString() + "]"; @@ -1011,7 +1016,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof BandConfig)) @@ -1125,6 +1130,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "FmBandConfig [" + super.toString() @@ -1145,7 +1151,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!super.equals(obj)) @@ -1317,6 +1323,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "AmBandConfig [" + super.toString() @@ -1332,7 +1339,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!super.equals(obj)) @@ -1656,6 +1663,7 @@ public class RadioManager { return 0; } + @NonNull @Override public String toString() { return "ProgramInfo" @@ -1676,7 +1684,7 @@ public class RadioManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof ProgramInfo)) return false; ProgramInfo other = (ProgramInfo) obj; diff --git a/core/java/android/hardware/radio/RadioMetadata.java b/core/java/android/hardware/radio/RadioMetadata.java index baa7a502688eb..a17413a15e9c0 100644 --- a/core/java/android/hardware/radio/RadioMetadata.java +++ b/core/java/android/hardware/radio/RadioMetadata.java @@ -269,6 +269,7 @@ public final class RadioMetadata implements Parcelable { mBundle = in.readBundle(); } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder("RadioMetadata["); diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index 007f4bcd43fca..7c12737e5ecb7 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -22,6 +22,7 @@ import static android.system.OsConstants.ENOSYS; import static android.system.OsConstants.EPERM; import static android.system.OsConstants.EPIPE; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; @@ -821,7 +822,7 @@ public class SoundTrigger { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (obj == null) @@ -861,6 +862,7 @@ public class SoundTrigger { return true; } + @NonNull @Override public String toString() { return "RecognitionEvent [status=" + status + ", soundModelHandle=" + soundModelHandle diff --git a/core/java/android/hardware/usb/UsbPort.java b/core/java/android/hardware/usb/UsbPort.java index afdb202211dd4..c8d5774eaa1f8 100644 --- a/core/java/android/hardware/usb/UsbPort.java +++ b/core/java/android/hardware/usb/UsbPort.java @@ -16,6 +16,7 @@ package android.hardware.usb; +import android.annotation.NonNull; import android.hardware.usb.V1_0.Constants; import android.os.Parcel; import android.os.Parcelable; @@ -271,7 +272,7 @@ public final class UsbPort implements Parcelable { return false; } - + @NonNull @Override public String toString() { return "UsbPort{id=" + mId + ", supportedModes=" + modeToString(mSupportedModes) + "}"; diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java index 2cd8209fccdae..b09708b5f47fd 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -16,6 +16,7 @@ package android.hardware.usb; +import android.annotation.NonNull; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -107,6 +108,7 @@ public final class UsbPortStatus implements Parcelable { return mSupportedRoleCombinations; } + @NonNull @Override public String toString() { return "UsbPortStatus{connected=" + isConnected() @@ -131,7 +133,7 @@ public final class UsbPortStatus implements Parcelable { dest.writeInt(mSupportedRoleCombinations); } - public static final Parcelable.Creator CREATOR = + public static final @NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override public UsbPortStatus createFromParcel(Parcel in) { diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index 889e9bc7875e9..2262a046471d2 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -853,6 +853,7 @@ public final class IpSecManager { return mResourceId; } + @NonNull @Override public String toString() { return new StringBuilder() diff --git a/core/java/android/net/NetworkKey.java b/core/java/android/net/NetworkKey.java index 31a74dc77250b..5f0c7b788166a 100644 --- a/core/java/android/net/NetworkKey.java +++ b/core/java/android/net/NetworkKey.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.net.wifi.ScanResult; @@ -152,7 +153,7 @@ public class NetworkKey implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -166,6 +167,7 @@ public class NetworkKey implements Parcelable { return Objects.hash(type, wifiKey); } + @NonNull @Override public String toString() { switch (type) { diff --git a/core/java/android/net/RssiCurve.java b/core/java/android/net/RssiCurve.java index 5b81f52ac58c3..4b4451c37d1d8 100644 --- a/core/java/android/net/RssiCurve.java +++ b/core/java/android/net/RssiCurve.java @@ -16,6 +16,8 @@ package android.net; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -170,7 +172,7 @@ public class RssiCurve implements Parcelable { * not considered equal to each other. */ @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -187,6 +189,7 @@ public class RssiCurve implements Parcelable { return Objects.hash(start, bucketWidth, activeNetworkRssiBoost) ^ Arrays.hashCode(rssiBuckets); } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/net/ScoredNetwork.java b/core/java/android/net/ScoredNetwork.java index e38d227bb4e62..66497890f53e5 100644 --- a/core/java/android/net/ScoredNetwork.java +++ b/core/java/android/net/ScoredNetwork.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Bundle; @@ -182,7 +183,7 @@ public class ScoredNetwork implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -220,6 +221,7 @@ public class ScoredNetwork implements Parcelable { return Objects.hash(networkKey, rssiCurve, meteredHint, attributes); } + @NonNull @Override public String toString() { StringBuilder out = new StringBuilder( diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index 0600036848d68..9ce6bae843a9f 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -236,6 +236,7 @@ public final class StaticIpConfiguration implements Parcelable { return lp; } + @NonNull @Override public String toString() { StringBuffer str = new StringBuffer(); @@ -267,7 +268,7 @@ public final class StaticIpConfiguration implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (!(obj instanceof StaticIpConfiguration)) return false; diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index fbc281f26ce86..994c794e69971 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -18,6 +18,7 @@ package android.net; import static android.util.Patterns.GOOD_IRI_CHAR; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Build; @@ -132,6 +133,7 @@ public class WebAddress { if (mScheme.equals("")) mScheme = "http"; } + @NonNull @Override public String toString() { String port = ""; diff --git a/core/java/android/net/WifiKey.java b/core/java/android/net/WifiKey.java index 68b505d49da6d..d9e0cf15afd40 100644 --- a/core/java/android/net/WifiKey.java +++ b/core/java/android/net/WifiKey.java @@ -16,6 +16,8 @@ package android.net; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -91,7 +93,7 @@ public class WifiKey implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -105,6 +107,7 @@ public class WifiKey implements Parcelable { return Objects.hash(ssid, bssid); } + @NonNull @Override public String toString() { return "WifiKey[SSID=" + ssid + ",BSSID=" + bssid + "]"; diff --git a/core/java/android/net/apf/ApfCapabilities.java b/core/java/android/net/apf/ApfCapabilities.java index 4dd2ace59c624..b1de74e817bc8 100644 --- a/core/java/android/net/apf/ApfCapabilities.java +++ b/core/java/android/net/apf/ApfCapabilities.java @@ -17,6 +17,7 @@ package android.net.apf; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.content.res.Resources; @@ -91,6 +92,7 @@ public final class ApfCapabilities implements Parcelable { } }; + @NonNull @Override public String toString() { return String.format("%s{version: %d, maxSize: %d, format: %d}", getClass().getSimpleName(), @@ -98,7 +100,7 @@ public final class ApfCapabilities implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (!(obj instanceof ApfCapabilities)) return false; final ApfCapabilities other = (ApfCapabilities) obj; return apfVersionSupported == other.apfVersionSupported diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java index cd8ce8d877782..fbe4ac0a8d70e 100644 --- a/core/java/android/net/metrics/ApfProgramEvent.java +++ b/core/java/android/net/metrics/ApfProgramEvent.java @@ -18,6 +18,7 @@ package android.net.metrics; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; @@ -185,6 +186,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { return 0; } + @NonNull @Override public String toString() { String lifetimeString = (lifetime < Long.MAX_VALUE) ? lifetime + "s" : "forever"; @@ -193,7 +195,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(ApfProgramEvent.class))) return false; final ApfProgramEvent other = (ApfProgramEvent) obj; return lifetime == other.lifetime diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java index 2e78469afd0df..191303f8684cc 100644 --- a/core/java/android/net/metrics/ApfStats.java +++ b/core/java/android/net/metrics/ApfStats.java @@ -17,6 +17,7 @@ package android.net.metrics; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; @@ -260,6 +261,7 @@ public final class ApfStats implements IpConnectivityLog.Event { return 0; } + @NonNull @Override public String toString() { return new StringBuilder("ApfStats(") @@ -276,7 +278,7 @@ public final class ApfStats implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(ApfStats.class))) return false; final ApfStats other = (ApfStats) obj; return durationMs == other.durationMs diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index fa6bff32b8221..0361eac8da710 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -17,6 +17,7 @@ package android.net.metrics; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; @@ -97,13 +98,14 @@ public final class DhcpClientEvent implements IpConnectivityLog.Event { return 0; } + @NonNull @Override public String toString() { return String.format("DhcpClientEvent(%s, %dms)", msg, durationMs); } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(DhcpClientEvent.class))) return false; final DhcpClientEvent other = (DhcpClientEvent) obj; return TextUtils.equals(msg, other.msg) diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java index 84823464a0935..751219016750c 100644 --- a/core/java/android/net/metrics/DhcpErrorEvent.java +++ b/core/java/android/net/metrics/DhcpErrorEvent.java @@ -16,6 +16,7 @@ package android.net.metrics; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -108,6 +109,7 @@ public final class DhcpErrorEvent implements IpConnectivityLog.Event { return (0xFFFF0000 & errorCode) | (0xFF & option); } + @NonNull @Override public String toString() { return String.format("DhcpErrorEvent(%s)", Decoder.constants.get(errorCode)); diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java index 77908e6593adc..66588a799cde6 100644 --- a/core/java/android/net/metrics/IpManagerEvent.java +++ b/core/java/android/net/metrics/IpManagerEvent.java @@ -17,6 +17,8 @@ package android.net.metrics; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -95,6 +97,7 @@ public final class IpManagerEvent implements IpConnectivityLog.Event { } }; + @NonNull @Override public String toString() { return String.format("IpManagerEvent(%s, %dms)", @@ -102,7 +105,7 @@ public final class IpManagerEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(IpManagerEvent.class))) return false; final IpManagerEvent other = (IpManagerEvent) obj; return eventType == other.eventType diff --git a/core/java/android/net/metrics/IpReachabilityEvent.java b/core/java/android/net/metrics/IpReachabilityEvent.java index f9ee39bf9fbda..8b856fb790a3f 100644 --- a/core/java/android/net/metrics/IpReachabilityEvent.java +++ b/core/java/android/net/metrics/IpReachabilityEvent.java @@ -16,6 +16,8 @@ package android.net.metrics; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -85,6 +87,7 @@ public final class IpReachabilityEvent implements IpConnectivityLog.Event { } }; + @NonNull @Override public String toString() { int hi = eventType & 0xff00; @@ -94,7 +97,7 @@ public final class IpReachabilityEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(IpReachabilityEvent.class))) return false; final IpReachabilityEvent other = (IpReachabilityEvent) obj; return eventType == other.eventType; diff --git a/core/java/android/net/metrics/NetworkEvent.java b/core/java/android/net/metrics/NetworkEvent.java index ec0f82a3aa660..ebdc2bf4faa6d 100644 --- a/core/java/android/net/metrics/NetworkEvent.java +++ b/core/java/android/net/metrics/NetworkEvent.java @@ -17,6 +17,8 @@ package android.net.metrics; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -115,6 +117,7 @@ public final class NetworkEvent implements IpConnectivityLog.Event { } }; + @NonNull @Override public String toString() { return String.format("NetworkEvent(%s, %dms)", @@ -122,7 +125,7 @@ public final class NetworkEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(NetworkEvent.class))) return false; final NetworkEvent other = (NetworkEvent) obj; return eventType == other.eventType diff --git a/core/java/android/net/metrics/RaEvent.java b/core/java/android/net/metrics/RaEvent.java index 6ccca7dba5b9b..e62154dd93204 100644 --- a/core/java/android/net/metrics/RaEvent.java +++ b/core/java/android/net/metrics/RaEvent.java @@ -17,6 +17,7 @@ package android.net.metrics; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -85,6 +86,7 @@ public final class RaEvent implements IpConnectivityLog.Event { return 0; } + @NonNull @Override public String toString() { return new StringBuilder("RaEvent(lifetimes: ") @@ -98,7 +100,7 @@ public final class RaEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(RaEvent.class))) return false; final RaEvent other = (RaEvent) obj; return routerLifetime == other.routerLifetime diff --git a/core/java/android/net/metrics/ValidationProbeEvent.java b/core/java/android/net/metrics/ValidationProbeEvent.java index 67844202de5d6..199c9d29dfbff 100644 --- a/core/java/android/net/metrics/ValidationProbeEvent.java +++ b/core/java/android/net/metrics/ValidationProbeEvent.java @@ -18,6 +18,7 @@ package android.net.metrics; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -164,6 +165,7 @@ public final class ValidationProbeEvent implements IpConnectivityLog.Event { return Decoder.constants.get(probeType & 0xff00, "UNKNOWN"); } + @NonNull @Override public String toString() { return String.format("ValidationProbeEvent(%s:%d %s, %dms)", @@ -171,7 +173,7 @@ public final class ValidationProbeEvent implements IpConnectivityLog.Event { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null || !(obj.getClass().equals(ValidationProbeEvent.class))) return false; final ValidationProbeEvent other = (ValidationProbeEvent) obj; return durationMs == other.durationMs diff --git a/core/java/android/os/IncidentReportArgs.java b/core/java/android/os/IncidentReportArgs.java index 1aeac5f53be01..6a56a26a11283 100644 --- a/core/java/android/os/IncidentReportArgs.java +++ b/core/java/android/os/IncidentReportArgs.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -110,6 +111,7 @@ public final class IncidentReportArgs implements Parcelable { /** * Print this report as a string. */ + @NonNull @Override public String toString() { final StringBuilder sb = new StringBuilder("Incident("); diff --git a/core/java/android/os/ServiceSpecificException.java b/core/java/android/os/ServiceSpecificException.java index 03d5d3e195e0f..49ce40bb6ee9d 100644 --- a/core/java/android/os/ServiceSpecificException.java +++ b/core/java/android/os/ServiceSpecificException.java @@ -15,6 +15,7 @@ */ package android.os; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -44,6 +45,7 @@ public class ServiceSpecificException extends RuntimeException { this.errorCode = errorCode; } + @NonNull @Override public String toString() { return super.toString() + " (code " + errorCode + ")"; diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java index 43f579d21ce21..0458b5e322b02 100644 --- a/core/java/android/os/WorkSource.java +++ b/core/java/android/os/WorkSource.java @@ -1,5 +1,6 @@ package android.os; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; @@ -186,7 +187,7 @@ public class WorkSource implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o instanceof WorkSource) { WorkSource other = (WorkSource) o; @@ -968,6 +969,7 @@ public class WorkSource implements Parcelable { mTags = tags; } + @NonNull @Override public String toString() { StringBuilder result = new StringBuilder("WorkChain{"); @@ -994,7 +996,7 @@ public class WorkSource implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o instanceof WorkChain) { WorkChain other = (WorkChain) o; diff --git a/core/java/android/printservice/PrintServiceInfo.java b/core/java/android/printservice/PrintServiceInfo.java index 57f122923c69b..1562e6b82bf6c 100644 --- a/core/java/android/printservice/PrintServiceInfo.java +++ b/core/java/android/printservice/PrintServiceInfo.java @@ -17,6 +17,7 @@ package android.printservice; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.content.ComponentName; import android.content.Context; @@ -292,7 +293,7 @@ public final class PrintServiceInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -313,6 +314,7 @@ public final class PrintServiceInfo implements Parcelable { return true; } + @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/core/java/android/provider/SearchIndexableData.java b/core/java/android/provider/SearchIndexableData.java index a60be5363d626..87f9af39f5bad 100644 --- a/core/java/android/provider/SearchIndexableData.java +++ b/core/java/android/provider/SearchIndexableData.java @@ -16,6 +16,7 @@ package android.provider; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.content.Context; @@ -139,6 +140,7 @@ public abstract class SearchIndexableData { context = ctx; } + @NonNull @Override public String toString() { final StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/provider/SearchIndexableResource.java b/core/java/android/provider/SearchIndexableResource.java index 1eb17345f09de..0765b6be00328 100644 --- a/core/java/android/provider/SearchIndexableResource.java +++ b/core/java/android/provider/SearchIndexableResource.java @@ -16,6 +16,7 @@ package android.provider; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.content.Context; @@ -66,6 +67,7 @@ public class SearchIndexableResource extends SearchIndexableData { super(context); } + @NonNull @Override public String toString() { final StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/service/euicc/EuiccProfileInfo.java b/core/java/android/service/euicc/EuiccProfileInfo.java index 4a3978242a114..94610e7e0ffe5 100644 --- a/core/java/android/service/euicc/EuiccProfileInfo.java +++ b/core/java/android/service/euicc/EuiccProfileInfo.java @@ -16,6 +16,7 @@ package android.service.euicc; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; @@ -395,7 +396,7 @@ public final class EuiccProfileInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -430,6 +431,7 @@ public final class EuiccProfileInfo implements Parcelable { return result; } + @NonNull @Override public String toString() { return "EuiccProfileInfo (nickname=" diff --git a/core/java/android/service/notification/Adjustment.java b/core/java/android/service/notification/Adjustment.java index 7348cf6848f99..882659f1dcc13 100644 --- a/core/java/android/service/notification/Adjustment.java +++ b/core/java/android/service/notification/Adjustment.java @@ -15,6 +15,7 @@ */ package android.service.notification; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.app.Notification; @@ -162,6 +163,7 @@ public final class Adjustment implements Parcelable { dest.writeInt(mUser); } + @NonNull @Override public String toString() { return "Adjustment{" diff --git a/core/java/android/service/notification/NotificationStats.java b/core/java/android/service/notification/NotificationStats.java index 76d5328d2fc5b..1df34a30646d2 100644 --- a/core/java/android/service/notification/NotificationStats.java +++ b/core/java/android/service/notification/NotificationStats.java @@ -16,6 +16,8 @@ package android.service.notification; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.app.RemoteInput; @@ -213,7 +215,7 @@ public final class NotificationStats implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -240,6 +242,7 @@ public final class NotificationStats implements Parcelable { return result; } + @NonNull @Override public String toString() { final StringBuilder sb = new StringBuilder("NotificationStats{"); diff --git a/core/java/android/service/notification/SnoozeCriterion.java b/core/java/android/service/notification/SnoozeCriterion.java index bd93eff95dbd3..ab93cda9821b7 100644 --- a/core/java/android/service/notification/SnoozeCriterion.java +++ b/core/java/android/service/notification/SnoozeCriterion.java @@ -15,6 +15,7 @@ */ package android.service.notification; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -118,7 +119,7 @@ public final class SnoozeCriterion implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; diff --git a/core/java/android/service/resolver/ResolverTarget.java b/core/java/android/service/resolver/ResolverTarget.java index fb3e2d7384690..149d2fd0db373 100644 --- a/core/java/android/service/resolver/ResolverTarget.java +++ b/core/java/android/service/resolver/ResolverTarget.java @@ -16,13 +16,10 @@ package android.service.resolver; +import android.annotation.NonNull; import android.annotation.SystemApi; -import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.util.ArrayMap; - -import java.util.Map; /** * A ResolverTarget contains features by which an app or option will be ranked, in @@ -173,6 +170,7 @@ public final class ResolverTarget implements Parcelable { } // serialize the class to a string. + @NonNull @Override public String toString() { return "ResolverTarget{" diff --git a/location/java/android/location/GpsClock.java b/location/java/android/location/GpsClock.java index 4135a1c949bb1..2e66b416b8a21 100644 --- a/location/java/android/location/GpsClock.java +++ b/location/java/android/location/GpsClock.java @@ -16,6 +16,7 @@ package android.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -437,6 +438,7 @@ public class GpsClock implements Parcelable { return 0; } + @NonNull @Override public String toString() { final String format = " %-15s = %s\n"; diff --git a/location/java/android/location/GpsMeasurement.java b/location/java/android/location/GpsMeasurement.java index f13a440f411ae..a8cd756ae6693 100644 --- a/location/java/android/location/GpsMeasurement.java +++ b/location/java/android/location/GpsMeasurement.java @@ -16,6 +16,7 @@ package android.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -1244,6 +1245,7 @@ public class GpsMeasurement implements Parcelable { return 0; } + @NonNull @Override public String toString() { final String format = " %-29s = %s\n"; diff --git a/location/java/android/location/GpsMeasurementsEvent.java b/location/java/android/location/GpsMeasurementsEvent.java index 1366873378617..2442d8c36f8d4 100644 --- a/location/java/android/location/GpsMeasurementsEvent.java +++ b/location/java/android/location/GpsMeasurementsEvent.java @@ -140,6 +140,7 @@ public class GpsMeasurementsEvent implements Parcelable { parcel.writeTypedArray(measurementsArray, flags); } + @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder("[ GpsMeasurementsEvent:\n\n"); diff --git a/location/java/android/location/GpsNavigationMessage.java b/location/java/android/location/GpsNavigationMessage.java index 5c3c71012cdd5..7823597afa98d 100644 --- a/location/java/android/location/GpsNavigationMessage.java +++ b/location/java/android/location/GpsNavigationMessage.java @@ -290,6 +290,7 @@ public class GpsNavigationMessage implements Parcelable { return 0; } + @NonNull @Override public String toString() { final String format = " %-15s = %s\n"; diff --git a/location/java/android/location/GpsNavigationMessageEvent.java b/location/java/android/location/GpsNavigationMessageEvent.java index bd6921c741529..8faa366a52846 100644 --- a/location/java/android/location/GpsNavigationMessageEvent.java +++ b/location/java/android/location/GpsNavigationMessageEvent.java @@ -109,6 +109,7 @@ public class GpsNavigationMessageEvent implements Parcelable { parcel.writeParcelable(mNavigationMessage, flags); } + @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder("[ GpsNavigationMessageEvent:\n\n"); diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 154bd563fb0ff..9c9c715970bcd 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -16,6 +16,7 @@ package android.location; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Build; @@ -705,6 +706,7 @@ public final class LocationRequest implements Parcelable { } } + @NonNull @Override public String toString() { StringBuilder s = new StringBuilder(); diff --git a/media/java/android/media/AudioFocusInfo.java b/media/java/android/media/AudioFocusInfo.java index 0a9ca025e2b0d..8875a15e4ce72 100644 --- a/media/java/android/media/AudioFocusInfo.java +++ b/media/java/android/media/AudioFocusInfo.java @@ -16,6 +16,7 @@ package android.media; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -144,7 +145,7 @@ public final class AudioFocusInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (obj == null) diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index fb10e6ee73331..6b5ecd1c696fb 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -41,7 +41,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.service.media.MediaBrowserService; import android.service.notification.NotificationListenerService; -import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; import android.view.KeyEvent; @@ -882,7 +881,7 @@ public final class MediaSessionManager { * @return {@code true} if equals, {@code false} otherwise */ @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (!(obj instanceof RemoteUserInfo)) { return false; } diff --git a/media/java/android/media/tv/TvInputHardwareInfo.java b/media/java/android/media/tv/TvInputHardwareInfo.java index 762f0c07e121f..ad8c94965045d 100644 --- a/media/java/android/media/tv/TvInputHardwareInfo.java +++ b/media/java/android/media/tv/TvInputHardwareInfo.java @@ -19,12 +19,14 @@ package android.media.tv; import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.hardware.tv.input.V1_0.Constants; import android.media.AudioManager; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; + import java.lang.annotation.Retention; /** @@ -141,6 +143,7 @@ public final class TvInputHardwareInfo implements Parcelable { return mCableConnectionStatus; } + @NonNull @Override public String toString() { StringBuilder b = new StringBuilder(128); diff --git a/media/java/android/media/tv/TvStreamConfig.java b/media/java/android/media/tv/TvStreamConfig.java index 0c2f3fec26a4b..75fe11a5dd22c 100644 --- a/media/java/android/media/tv/TvStreamConfig.java +++ b/media/java/android/media/tv/TvStreamConfig.java @@ -16,6 +16,8 @@ package android.media.tv; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -87,6 +89,7 @@ public class TvStreamConfig implements Parcelable { return mGeneration; } + @NonNull @Override public String toString() { return "TvStreamConfig {mStreamId=" + mStreamId + ";" + "mType=" + mType + ";mGeneration=" @@ -163,7 +166,7 @@ public class TvStreamConfig implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null) return false; if (!(obj instanceof TvStreamConfig)) return false; diff --git a/media/java/android/media/tv/TvTrackInfo.java b/media/java/android/media/tv/TvTrackInfo.java index 10cbad9ed6af7..68c2a84b11c38 100644 --- a/media/java/android/media/tv/TvTrackInfo.java +++ b/media/java/android/media/tv/TvTrackInfo.java @@ -394,6 +394,7 @@ public final class TvTrackInfo implements Parcelable { * * @param encrypted The encryption status of the track. */ + @NonNull public Builder setEncrypted(boolean encrypted) { mEncrypted = encrypted; return this; diff --git a/telecomm/java/android/telecom/AudioState.java b/telecomm/java/android/telecom/AudioState.java index a9b75a3912558..4acee7dade4ef 100644 --- a/telecomm/java/android/telecom/AudioState.java +++ b/telecomm/java/android/telecom/AudioState.java @@ -16,6 +16,8 @@ package android.telecom; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Build; @@ -81,7 +83,7 @@ public class AudioState implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null) { return false; } @@ -93,6 +95,7 @@ public class AudioState implements Parcelable { getSupportedRouteMask() == state.getSupportedRouteMask(); } + @NonNull @Override public String toString() { return String.format(Locale.US, diff --git a/telephony/java/android/telephony/CallAttributes.java b/telephony/java/android/telephony/CallAttributes.java index 2ff2d91348deb..a52ad23256be8 100644 --- a/telephony/java/android/telephony/CallAttributes.java +++ b/telephony/java/android/telephony/CallAttributes.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -44,6 +45,7 @@ public final class CallAttributes implements Parcelable { this.mCallQuality = callQuality; } + @NonNull @Override public String toString() { return "mPreciseCallState=" + mPreciseCallState + " mNetworkType=" + mNetworkType @@ -109,7 +111,7 @@ public final class CallAttributes implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == null || !(o instanceof CallAttributes) || hashCode() != o.hashCode()) { return false; } diff --git a/telephony/java/android/telephony/CallQuality.java b/telephony/java/android/telephony/CallQuality.java index cbe6228471306..5ae3df3a88b09 100644 --- a/telephony/java/android/telephony/CallQuality.java +++ b/telephony/java/android/telephony/CallQuality.java @@ -17,6 +17,8 @@ package android.telephony; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -252,6 +254,7 @@ public final class CallQuality implements Parcelable { } // Parcelable things + @NonNull @Override public String toString() { return "CallQuality: {downlinkCallQualityLevel=" + mDownlinkCallQualityLevel @@ -285,7 +288,7 @@ public final class CallQuality implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == null || !(o instanceof CallQuality) || hashCode() != o.hashCode()) { return false; } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 44c50f0a288b9..4f6abfefcef88 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3480,7 +3480,7 @@ public class CarrierConfigManager { * @see #getConfigForSubId */ @Nullable - public PersistableBundle getConfigByComponentForSubId(String prefix, int subId) { + public PersistableBundle getConfigByComponentForSubId(@NonNull String prefix, int subId) { PersistableBundle configs = getConfigForSubId(subId); if (configs == null) { diff --git a/telephony/java/android/telephony/CarrierRestrictionRules.java b/telephony/java/android/telephony/CarrierRestrictionRules.java index cb15d7b967cb3..48812616afded 100644 --- a/telephony/java/android/telephony/CarrierRestrictionRules.java +++ b/telephony/java/android/telephony/CarrierRestrictionRules.java @@ -323,6 +323,7 @@ public final class CarrierRestrictionRules implements Parcelable { } }; + @NonNull @Override public String toString() { return "CarrierRestrictionRules(allowed:" + mAllowedCarriers + ", excluded:" diff --git a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java index 3dd931898c18f..407ced71a0e79 100644 --- a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java +++ b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -134,6 +135,7 @@ public final class DataSpecificRegistrationInfo implements Parcelable { return 0; } + @NonNull @Override public String toString() { return new StringBuilder().append(this.getClass().getName()) @@ -155,7 +157,7 @@ public final class DataSpecificRegistrationInfo implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (!(o instanceof DataSpecificRegistrationInfo)) return false; diff --git a/telephony/java/android/telephony/LteVopsSupportInfo.java b/telephony/java/android/telephony/LteVopsSupportInfo.java index fda20bd4cf12d..80682312b303d 100644 --- a/telephony/java/android/telephony/LteVopsSupportInfo.java +++ b/telephony/java/android/telephony/LteVopsSupportInfo.java @@ -17,6 +17,8 @@ package android.telephony; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -94,7 +96,7 @@ public final class LteVopsSupportInfo implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == null || !(o instanceof LteVopsSupportInfo)) { return false; } @@ -112,6 +114,7 @@ public final class LteVopsSupportInfo implements Parcelable { /** * @return string representation. */ + @NonNull @Override public String toString() { return ("LteVopsSupportInfo : " diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index 2fae949cacb35..a76b8da09064c 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -501,6 +501,7 @@ public final class NetworkRegistrationInfo implements Parcelable { } } + @NonNull @Override public String toString() { return new StringBuilder("NetworkRegistrationInfo{") @@ -531,7 +532,7 @@ public final class NetworkRegistrationInfo implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (!(o instanceof NetworkRegistrationInfo)) { diff --git a/telephony/java/android/telephony/PhoneNumberRange.java b/telephony/java/android/telephony/PhoneNumberRange.java index 12df9b5b33fe2..0cb3544f1bc49 100644 --- a/telephony/java/android/telephony/PhoneNumberRange.java +++ b/telephony/java/android/telephony/PhoneNumberRange.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -104,7 +105,7 @@ public final class PhoneNumberRange implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; PhoneNumberRange that = (PhoneNumberRange) o; @@ -119,6 +120,7 @@ public final class PhoneNumberRange implements Parcelable { return Objects.hash(mCountryCode, mPrefix, mLowerBound, mUpperBound); } + @NonNull @Override public String toString() { return "PhoneNumberRange{" diff --git a/telephony/java/android/telephony/PreciseCallState.java b/telephony/java/android/telephony/PreciseCallState.java index 19e1931a30dfd..0c98c4c302948 100644 --- a/telephony/java/android/telephony/PreciseCallState.java +++ b/telephony/java/android/telephony/PreciseCallState.java @@ -17,6 +17,8 @@ package android.telephony; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; @@ -276,7 +278,7 @@ public final class PreciseCallState implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -294,6 +296,7 @@ public final class PreciseCallState implements Parcelable { && mPreciseDisconnectCause == other.mPreciseDisconnectCause); } + @NonNull @Override public String toString() { StringBuffer sb = new StringBuffer(); diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index d59367821a5d9..d40b6a2ec920f 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -177,7 +177,7 @@ public final class PreciseDataConnectionState implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (!(obj instanceof PreciseDataConnectionState)) { return false; @@ -191,6 +191,7 @@ public final class PreciseDataConnectionState implements Parcelable { && mState == other.mState; } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/telephony/java/android/telephony/SubscriptionPlan.java b/telephony/java/android/telephony/SubscriptionPlan.java index d67169ccd2849..98291a0cd10ed 100644 --- a/telephony/java/android/telephony/SubscriptionPlan.java +++ b/telephony/java/android/telephony/SubscriptionPlan.java @@ -131,7 +131,7 @@ public final class SubscriptionPlan implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj instanceof SubscriptionPlan) { final SubscriptionPlan other = (SubscriptionPlan) obj; return Objects.equals(cycleRule, other.cycleRule) diff --git a/telephony/java/android/telephony/TelephonyHistogram.java b/telephony/java/android/telephony/TelephonyHistogram.java index e1c3d7b3c858e..19cd2c3ba3d0b 100644 --- a/telephony/java/android/telephony/TelephonyHistogram.java +++ b/telephony/java/android/telephony/TelephonyHistogram.java @@ -15,13 +15,12 @@ */ package android.telephony; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; /** * Parcelable class to store Telephony histogram. @@ -238,6 +237,8 @@ public final class TelephonyHistogram implements Parcelable { } } + @NonNull + @Override public String toString() { String basic = " Histogram id = " + mId + " Time(ms): min = " + mMinTimeMs + " max = " + mMaxTimeMs + " avg = " + mAverageTimeMs + " Count = " + mSampleCount; diff --git a/telephony/java/android/telephony/UiccAccessRule.java b/telephony/java/android/telephony/UiccAccessRule.java index d8836dccbcde8..fce76b2da3c2b 100644 --- a/telephony/java/android/telephony/UiccAccessRule.java +++ b/telephony/java/android/telephony/UiccAccessRule.java @@ -15,6 +15,7 @@ */ package android.telephony; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.content.pm.PackageInfo; @@ -213,7 +214,7 @@ public final class UiccAccessRule implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -236,6 +237,7 @@ public final class UiccAccessRule implements Parcelable { return result; } + @NonNull @Override public String toString() { return "cert: " + IccUtils.bytesToHexString(mCertificateHash) + " pkg: " + diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index 2bc677562b782..8260b48b4f8b6 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -16,6 +16,8 @@ package android.telephony; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -179,7 +181,7 @@ public class UiccSlotInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -210,6 +212,7 @@ public class UiccSlotInfo implements Parcelable { return result; } + @NonNull @Override public String toString() { return "UiccSlotInfo (mIsActive=" diff --git a/telephony/java/android/telephony/data/DataCallResponse.java b/telephony/java/android/telephony/data/DataCallResponse.java index 3806a7e2cbe01..a6aea7c5fd477 100644 --- a/telephony/java/android/telephony/data/DataCallResponse.java +++ b/telephony/java/android/telephony/data/DataCallResponse.java @@ -213,6 +213,7 @@ public final class DataCallResponse implements Parcelable { */ public int getMtu() { return mMtu; } + @NonNull @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -233,7 +234,7 @@ public final class DataCallResponse implements Parcelable { } @Override - public boolean equals (Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (!(o instanceof DataCallResponse)) { diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index c53ade16cae42..0d79ec98fcbb8 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -257,6 +257,7 @@ public final class DataProfile implements Parcelable { return 0; } + @NonNull @Override public String toString() { return "DataProfile=" + mProfileId + "/" + mProtocolType + "/" + mAuthType @@ -303,7 +304,7 @@ public final class DataProfile implements Parcelable { }; @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; DataProfile that = (DataProfile) o; diff --git a/telephony/java/android/telephony/euicc/EuiccNotification.java b/telephony/java/android/telephony/euicc/EuiccNotification.java index 43a7707482605..d79084ceaa5c6 100644 --- a/telephony/java/android/telephony/euicc/EuiccNotification.java +++ b/telephony/java/android/telephony/euicc/EuiccNotification.java @@ -16,6 +16,7 @@ package android.telephony.euicc; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; @@ -107,7 +108,7 @@ public final class EuiccNotification implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -132,6 +133,7 @@ public final class EuiccNotification implements Parcelable { return result; } + @NonNull @Override public String toString() { return "EuiccNotification (seq=" diff --git a/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java b/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java index 67ae983efeb00..ee4d750e8eb60 100644 --- a/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java +++ b/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java @@ -16,6 +16,7 @@ package android.telephony.euicc; import android.annotation.IntDef; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -28,7 +29,6 @@ import com.android.internal.annotations.VisibleForTesting; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; -import java.util.ArrayList; import java.util.List; /** @@ -204,7 +204,7 @@ public final class EuiccRulesAuthTable implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index 70daa8babbdf3..f18398d38ea47 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -185,6 +185,7 @@ public final class ImsCallForwardInfo implements Parcelable { out.writeInt(mServiceClass); } + @NonNull @Override public String toString() { return super.toString() + ", Condition: " + mCondition diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index fd58f7ea2752e..e1c3aba915d8a 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -534,7 +534,7 @@ public final class ImsCallProfile implements Parcelable { mMediaProfile = profile.mMediaProfile; } - + @NonNull @Override public String toString() { return "{ serviceType=" + mServiceType diff --git a/telephony/java/android/telephony/ims/ImsConferenceState.java b/telephony/java/android/telephony/ims/ImsConferenceState.java index 8af8cffcd878c..0c0bc76f8bbaa 100644 --- a/telephony/java/android/telephony/ims/ImsConferenceState.java +++ b/telephony/java/android/telephony/ims/ImsConferenceState.java @@ -16,6 +16,7 @@ package android.telephony.ims; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Bundle; import android.os.Parcel; @@ -176,6 +177,7 @@ public final class ImsConferenceState implements Parcelable { return Call.STATE_ACTIVE; } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/telephony/java/android/telephony/ims/ImsExternalCallState.java b/telephony/java/android/telephony/ims/ImsExternalCallState.java index c56915d131f38..a199d8a82f346 100644 --- a/telephony/java/android/telephony/ims/ImsExternalCallState.java +++ b/telephony/java/android/telephony/ims/ImsExternalCallState.java @@ -213,6 +213,7 @@ public final class ImsExternalCallState implements Parcelable { return mIsHeld; } + @NonNull @Override public String toString() { return "ImsExternalCallState { mCallId = " + mCallId + diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index ace3caf3c0df0..2dc390d33670c 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; @@ -1170,6 +1171,8 @@ public final class ImsReasonInfo implements Parcelable { /** * @return the string format of {@link ImsReasonInfo} */ + @NonNull + @Override public String toString() { return "ImsReasonInfo :: {" + mCode + ", " + mExtraCode + ", " + mExtraMessage + "}"; } diff --git a/telephony/java/android/telephony/ims/ImsSsData.java b/telephony/java/android/telephony/ims/ImsSsData.java index 0f5675886d38f..ec3838c5c38d4 100644 --- a/telephony/java/android/telephony/ims/ImsSsData.java +++ b/telephony/java/android/telephony/ims/ImsSsData.java @@ -570,6 +570,8 @@ public final class ImsSsData implements Parcelable { return mCfInfo; } + @NonNull + @Override public String toString() { return "[ImsSsData] " + "ServiceType: " + getServiceType() + " RequestType: " + getRequestType() diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index 02f0cef04a214..91a7503ac142a 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -254,6 +254,7 @@ public final class ImsSsInfo implements Parcelable { out.writeInt(mClirOutgoingState); } + @NonNull @Override public String toString() { return super.toString() + ", Status: " + ((mStatus == 0) ? "disabled" : "enabled") diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index d11a0de24fb5f..4b9c25172a832 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -16,6 +16,7 @@ package android.telephony.ims; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.os.Parcel; @@ -194,6 +195,7 @@ public final class ImsStreamMediaProfile implements Parcelable { mRttMode = profile.mRttMode; } + @NonNull @Override public String toString() { return "{ audioQuality=" + mAudioQuality + diff --git a/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java b/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java index efaade8252249..d3014fee08f9d 100644 --- a/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java +++ b/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java @@ -17,6 +17,7 @@ package android.telephony.ims; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -67,6 +68,7 @@ public final class ImsSuppServiceNotification implements Parcelable { history = in.createStringArray(); } + @NonNull @Override public String toString() { return "{ notificationType=" + notificationType + diff --git a/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java b/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java index 1ee85633c6dc0..7ca34fa622ad1 100644 --- a/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java +++ b/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java @@ -16,6 +16,7 @@ package android.telephony.ims.feature; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -98,6 +99,7 @@ public final class CapabilityChangeRequest implements Parcelable { return radioTech; } + @NonNull @Override public String toString() { return "CapabilityPair{" @@ -219,6 +221,7 @@ public final class CapabilityChangeRequest implements Parcelable { } } + @NonNull @Override public String toString() { return "CapabilityChangeRequest{" diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index 056a0abe7a29b..20c191da0550f 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -291,6 +291,7 @@ public class MmTelFeature extends ImsFeature { return super.isCapable(capabilities); } + @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder("MmTel Capabilities - ["); diff --git a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java index 1a839fcb75b69..4e00e101741b4 100644 --- a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java +++ b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java @@ -16,6 +16,8 @@ package android.telephony.ims.stub; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -60,7 +62,7 @@ public final class ImsFeatureConfiguration implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -77,6 +79,7 @@ public final class ImsFeatureConfiguration implements Parcelable { return result; } + @NonNull @Override public String toString() { return "{s=" + slotId + ", f=" + ImsFeature.FEATURE_LOG_MAP.get(featureType) + "}"; diff --git a/telephony/java/android/telephony/mbms/DownloadRequest.java b/telephony/java/android/telephony/mbms/DownloadRequest.java index 9e3302bd07e04..1daf0ebb557f6 100644 --- a/telephony/java/android/telephony/mbms/DownloadRequest.java +++ b/telephony/java/android/telephony/mbms/DownloadRequest.java @@ -17,6 +17,7 @@ package android.telephony.mbms; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.content.Intent; @@ -381,7 +382,7 @@ public final class DownloadRequest implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) return true; if (o == null) { return false; diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java index 9ab374a5c4cb9..6a534b94cafbe 100644 --- a/wifi/java/android/net/wifi/RttManager.java +++ b/wifi/java/android/net/wifi/RttManager.java @@ -211,6 +211,7 @@ public class RttManager { /** Draft 11mc version supported, including major and minor version. e.g, draft 4.3 is 43 */ public int mcVersion; + @NonNull @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -1130,6 +1131,7 @@ public class RttManager { */ public int preamble; + @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.java b/wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.java index 9b2fdc852a1ac..a94a6102b863f 100644 --- a/wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.java +++ b/wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.java @@ -16,8 +16,8 @@ package android.net.wifi; +import android.annotation.NonNull; import android.annotation.SystemApi; - import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +39,7 @@ public class WifiNetworkConnectionStatistics implements Parcelable { public WifiNetworkConnectionStatistics() { } - + @NonNull @Override public String toString() { StringBuilder sbuf = new StringBuilder(); diff --git a/wifi/java/android/net/wifi/hotspot2/OsuProvider.java b/wifi/java/android/net/wifi/hotspot2/OsuProvider.java index 25dcdd8f3fff2..4fa8b48bff22f 100644 --- a/wifi/java/android/net/wifi/hotspot2/OsuProvider.java +++ b/wifi/java/android/net/wifi/hotspot2/OsuProvider.java @@ -16,6 +16,8 @@ package android.net.wifi.hotspot2; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.drawable.Icon; import android.net.Uri; import android.net.wifi.WifiSsid; @@ -171,7 +173,7 @@ public final class OsuProvider implements Parcelable { } @Override - public boolean equals(Object thatObject) { + public boolean equals(@Nullable Object thatObject) { if (this == thatObject) { return true; } @@ -196,6 +198,7 @@ public final class OsuProvider implements Parcelable { mNetworkAccessIdentifier, mMethodList, mIcon); } + @NonNull @Override public String toString() { return "OsuProvider{mOsuSsid=" + mOsuSsid diff --git a/wifi/java/android/net/wifi/rtt/RangingRequest.java b/wifi/java/android/net/wifi/rtt/RangingRequest.java index 339233b26e6bb..058b488aef673 100644 --- a/wifi/java/android/net/wifi/rtt/RangingRequest.java +++ b/wifi/java/android/net/wifi/rtt/RangingRequest.java @@ -17,6 +17,7 @@ package android.net.wifi.rtt; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.net.MacAddress; import android.net.wifi.ScanResult; @@ -245,7 +246,7 @@ public final class RangingRequest implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) { return true; } diff --git a/wifi/java/android/net/wifi/rtt/ResponderConfig.java b/wifi/java/android/net/wifi/rtt/ResponderConfig.java index 166af6cd0a51b..3ca0c173dadf5 100644 --- a/wifi/java/android/net/wifi/rtt/ResponderConfig.java +++ b/wifi/java/android/net/wifi/rtt/ResponderConfig.java @@ -21,6 +21,7 @@ import static android.net.wifi.ScanResult.InformationElement.EID_VHT_CAPABILITIE import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.net.MacAddress; import android.net.wifi.ScanResult; @@ -443,7 +444,7 @@ public final class ResponderConfig implements Parcelable { }; @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (this == o) { return true; }