diff options
| author | 2019-08-28 13:01:05 -0700 | |
|---|---|---|
| committer | 2019-08-30 00:14:44 +0000 | |
| commit | 00be951a089cb5318c4354513699d630e617886b (patch) | |
| tree | 4c4dd49e86b4ffa2e5dc16514ee436d68af805cd | |
| parent | 0a7dd8e87a02ec7be55db8200c1057f4fc3e1512 (diff) | |
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
124 files changed, 290 insertions, 96 deletions
diff --git a/api/current.txt b/api/current.txt index dffe7844edf0..1cfc86a33d21 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28139,7 +28139,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); @@ -44004,7 +44004,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 3edf5d96d0e5..0f0cc1c9d395 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1191,7 +1191,7 @@ package android.app.usage { public static final class UsageEvents.Event { method public int getInstanceId(); - method public String getNotificationChannelId(); + method @Nullable public String getNotificationChannelId(); method @Nullable public String getTaskRootClassName(); method @Nullable public String getTaskRootPackageName(); method public boolean isInstantApp(); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 2f0782b413bf..da4c0386a76f 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -3192,7 +3192,7 @@ public class AppOpsManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -3223,6 +3223,7 @@ public class AppOpsManager { return result; } + @NonNull @Override public String toString() { return getClass().getSimpleName() + "[from:" @@ -3458,7 +3459,7 @@ public class AppOpsManager { }; @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -3690,7 +3691,7 @@ public class AppOpsManager { }; @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -4044,7 +4045,7 @@ public class AppOpsManager { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index af2d774508c4..d9e8763d7f7b 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -566,6 +566,7 @@ public class StatusBarManager { mSearch = true; } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/app/Vr2dDisplayProperties.java b/core/java/android/app/Vr2dDisplayProperties.java index fc200bf05253..d2a49fb82e70 100644 --- a/core/java/android/app/Vr2dDisplayProperties.java +++ b/core/java/android/app/Vr2dDisplayProperties.java @@ -18,6 +18,7 @@ package android.app; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -74,6 +75,7 @@ public final class Vr2dDisplayProperties implements Parcelable { return result; } + @NonNull @Override public String toString() { return "Vr2dDisplayProperties{" @@ -86,7 +88,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 7854394bb02e..498b68642d9d 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/prediction/AppPredictionContext.java b/core/java/android/app/prediction/AppPredictionContext.java index 298b0031d726..d14238bb2672 100644 --- a/core/java/android/app/prediction/AppPredictionContext.java +++ b/core/java/android/app/prediction/AppPredictionContext.java @@ -90,7 +90,7 @@ public final class AppPredictionContext implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) return true; if (!getClass().equals(o != null ? o.getClass() : null)) return false; diff --git a/core/java/android/app/prediction/AppPredictionSessionId.java b/core/java/android/app/prediction/AppPredictionSessionId.java index 281a16f7715a..e5e06f859ac6 100644 --- a/core/java/android/app/prediction/AppPredictionSessionId.java +++ b/core/java/android/app/prediction/AppPredictionSessionId.java @@ -16,6 +16,7 @@ package android.app.prediction; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -46,7 +47,7 @@ public final class AppPredictionSessionId implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!getClass().equals(o != null ? o.getClass() : null)) return false; AppPredictionSessionId other = (AppPredictionSessionId) o; diff --git a/core/java/android/app/prediction/AppTarget.java b/core/java/android/app/prediction/AppTarget.java index 147c5000e333..6f2149007b8d 100644 --- a/core/java/android/app/prediction/AppTarget.java +++ b/core/java/android/app/prediction/AppTarget.java @@ -151,7 +151,7 @@ public final class AppTarget implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!getClass().equals(o != null ? o.getClass() : null)) return false; AppTarget other = (AppTarget) o; diff --git a/core/java/android/app/prediction/AppTargetEvent.java b/core/java/android/app/prediction/AppTargetEvent.java index 54b95639f68f..26ff0c17da2e 100644 --- a/core/java/android/app/prediction/AppTargetEvent.java +++ b/core/java/android/app/prediction/AppTargetEvent.java @@ -98,7 +98,7 @@ public final class AppTargetEvent implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!getClass().equals(o != null ? o.getClass() : null)) return false; AppTargetEvent other = (AppTargetEvent) o; diff --git a/core/java/android/app/prediction/AppTargetId.java b/core/java/android/app/prediction/AppTargetId.java index 3603f5f3ab10..052fdc11ef21 100644 --- a/core/java/android/app/prediction/AppTargetId.java +++ b/core/java/android/app/prediction/AppTargetId.java @@ -16,6 +16,7 @@ package android.app.prediction; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -59,7 +60,7 @@ public final class AppTargetId implements Parcelable { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!getClass().equals(o != null ? o.getClass() : null)) return false; AppTargetId other = (AppTargetId) o; diff --git a/core/java/android/app/usage/CacheQuotaHint.java b/core/java/android/app/usage/CacheQuotaHint.java index b92d538ce281..b5aed49f211e 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 b564c3121d2e..84c68552c40a 100644 --- a/core/java/android/app/usage/UsageEvents.java +++ b/core/java/android/app/usage/UsageEvents.java @@ -554,6 +554,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 f39fc6674a11..1a78f793c008 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -413,7 +413,7 @@ public final class OverlayInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -448,6 +448,7 @@ public final class OverlayInfo implements Parcelable { return true; } + @NonNull @Override public String toString() { return "OverlayInfo { overlay=" + packageName + ", targetPackage=" + targetPackageName diff --git a/core/java/android/content/pm/SuspendDialogInfo.java b/core/java/android/content/pm/SuspendDialogInfo.java index db8f8c2387d6..73b75df80e5b 100644 --- a/core/java/android/content/pm/SuspendDialogInfo.java +++ b/core/java/android/content/pm/SuspendDialogInfo.java @@ -185,7 +185,7 @@ public final class SuspendDialogInfo implements Parcelable { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } @@ -200,6 +200,7 @@ public final class SuspendDialogInfo implements Parcelable { && Objects.equals(mDialogMessage, otherDialogInfo.mDialogMessage); } + @NonNull @Override public String toString() { final StringBuilder builder = new StringBuilder("SuspendDialogInfo: {"); diff --git a/core/java/android/hardware/display/AmbientBrightnessDayStats.java b/core/java/android/hardware/display/AmbientBrightnessDayStats.java index b25ef8d6a88f..350bc30d8d24 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 5b63dcfa7ad6..4c2e297d2133 100644 --- a/core/java/android/hardware/display/BrightnessConfiguration.java +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -145,6 +145,7 @@ public final class BrightnessConfiguration implements Parcelable { return 0; } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder("BrightnessConfiguration{["); @@ -184,7 +185,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/display/BrightnessCorrection.java b/core/java/android/hardware/display/BrightnessCorrection.java index b029accab576..22df778a1368 100644 --- a/core/java/android/hardware/display/BrightnessCorrection.java +++ b/core/java/android/hardware/display/BrightnessCorrection.java @@ -18,6 +18,7 @@ package android.hardware.display; import android.annotation.FloatRange; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -98,13 +99,13 @@ public final class BrightnessCorrection implements Parcelable { * * @return A string representation. */ + @NonNull public String toString() { return mImplementation.toString(); } - @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 136211679c6b..55b07268d201 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 f17cfbabfb7e..c865413eca81 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 b5da381a4f99..a11f2e9e8373 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.Nullable; import android.annotation.SystemApi; import android.hardware.contexthub.V1_0.ContextHub; @@ -248,6 +249,7 @@ public class ContextHubInfo implements Parcelable { return mChrePatchVersion; } + @NonNull @Override public String toString() { String retVal = ""; diff --git a/core/java/android/hardware/location/ContextHubIntentEvent.java b/core/java/android/hardware/location/ContextHubIntentEvent.java index d1190ab28ed5..754327a17dc7 100644 --- a/core/java/android/hardware/location/ContextHubIntentEvent.java +++ b/core/java/android/hardware/location/ContextHubIntentEvent.java @@ -192,6 +192,7 @@ public class ContextHubIntentEvent { return mNanoAppMessage; } + @NonNull @Override public String toString() { String out = "ContextHubIntentEvent[eventType = " + mEventType diff --git a/core/java/android/hardware/location/ContextHubMessage.java b/core/java/android/hardware/location/ContextHubMessage.java index 1c98427b9c23..6777c53940a6 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 @android.annotation.NonNull Parcelable.Creator<ContextHubMessage> CREATOR + public static final @NonNull Parcelable.Creator<ContextHubMessage> CREATOR = new Parcelable.Creator<ContextHubMessage>() { 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 fbbf6870bd5a..78cca9601a2d 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 @android.annotation.NonNull Creator<GeofenceHardwareMonitorEvent> CREATOR = + public static final @NonNull Creator<GeofenceHardwareMonitorEvent> CREATOR = new Creator<GeofenceHardwareMonitorEvent>() { @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 ecd369a42841..c033228441b1 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.Nullable; import android.annotation.SystemApi; import android.os.Parcel; @@ -79,6 +80,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 3fbb0690698c..6a734f369730 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; @@ -370,6 +371,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 0700dd1be423..1d8b69d0ede9 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 a6c754d971e3..ea1175639e23 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 078532a0e644..bb3e81ad0ec1 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.Nullable; import android.annotation.SystemApi; import android.os.Parcel; @@ -136,7 +137,7 @@ public final class NanoAppMessage implements Parcelable { out.writeByteArray(mMessageBody); } - public static final @android.annotation.NonNull Creator<NanoAppMessage> CREATOR = + public static final @NonNull Creator<NanoAppMessage> CREATOR = new Creator<NanoAppMessage>() { @Override public NanoAppMessage createFromParcel(Parcel in) { @@ -149,6 +150,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 277a1861b723..948447f69b78 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 a7ff64412fc3..6ea2ac414704 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 1cbb171df27e..e953e222917a 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 5b5bd7661bc5..f96f47dfaffc 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; @@ -829,7 +830,7 @@ public class SoundTrigger { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) return true; if (obj == null) @@ -869,6 +870,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 c674480c2a75..506230ecec86 100644 --- a/core/java/android/hardware/usb/UsbPort.java +++ b/core/java/android/hardware/usb/UsbPort.java @@ -327,7 +327,7 @@ public final class UsbPort { 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 5e9a410a6b84..43c418e2cb26 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -17,6 +17,7 @@ package android.hardware.usb; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.hardware.usb.V1_0.Constants; import android.os.Parcel; @@ -322,6 +323,7 @@ public final class UsbPortStatus implements Parcelable { return mContaminantProtectionStatus; } + @NonNull @Override public String toString() { return "UsbPortStatus{connected=" + isConnected() @@ -352,7 +354,7 @@ public final class UsbPortStatus implements Parcelable { dest.writeInt(mContaminantDetectionStatus); } - public static final @android.annotation.NonNull Parcelable.Creator<UsbPortStatus> CREATOR = + public static final @NonNull Parcelable.Creator<UsbPortStatus> CREATOR = new Parcelable.Creator<UsbPortStatus>() { @Override public UsbPortStatus createFromParcel(Parcel in) { diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index 83813da80c44..45d0c7313fca 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -861,6 +861,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 0a9a3c8f5084..a101da7b4b9c 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 a173b0c2b97b..668e96618f34 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 effc1aa54735..64b3bf1e0aa0 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 d6deba5d41cc..5bc9953e0d05 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 fbc281f26ce8..994c794e6997 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 e3a93a8d0b8f..bc9d8c54090a 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 4dd2ace59c62..b1de74e817bc 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 e9c209c9cb3b..8243be9c1355 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 b9637774e926..eac5579f9eaa 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 2fed7363b713..5f9f50708a49 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 876000463cb1..32efb5adafcd 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 ba05c5900acf..f14abb895cb4 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 d4ba2943d72b..79e01d7116b6 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 0c57ec644226..fe603cf9305c 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 3fd87c23b87d..661f648fc74e 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 1aaa50d139e0..8fab64ae6c4e 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/BatterySaverPolicyConfig.java b/core/java/android/os/BatterySaverPolicyConfig.java index 3801cbd48cdd..3f6ce4fa807c 100644 --- a/core/java/android/os/BatterySaverPolicyConfig.java +++ b/core/java/android/os/BatterySaverPolicyConfig.java @@ -161,6 +161,7 @@ public final class BatterySaverPolicyConfig implements Parcelable { dest.writeInt(mLocationMode); } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/core/java/android/os/IncidentManager.java b/core/java/android/os/IncidentManager.java index a94fd65943a9..09e1c0f6ab1f 100644 --- a/core/java/android/os/IncidentManager.java +++ b/core/java/android/os/IncidentManager.java @@ -255,7 +255,7 @@ public class IncidentManager { * @inheritDoc */ @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; } diff --git a/core/java/android/os/IncidentReportArgs.java b/core/java/android/os/IncidentReportArgs.java index a1f2430f4ee3..7e858e1dc390 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; @@ -117,6 +118,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 03d5d3e195e0..49ce40bb6ee9 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 0b4a56121038..634b2baf098a 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.TestApi; @@ -202,7 +203,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; @@ -985,6 +986,7 @@ public class WorkSource implements Parcelable { mTags = tags; } + @NonNull @Override public String toString() { StringBuilder result = new StringBuilder("WorkChain{"); @@ -1011,7 +1013,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/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index 182a2ffa5221..a2ab0c15b150 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -19,6 +19,7 @@ package android.permission; import android.Manifest; import android.annotation.IntRange; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; @@ -136,7 +137,7 @@ public final class PermissionManager { private final int mTargetSdk; @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; SplitPermissionInfo that = (SplitPermissionInfo) o; diff --git a/core/java/android/printservice/PrintServiceInfo.java b/core/java/android/printservice/PrintServiceInfo.java index 565843e9bba5..0c1b61d583b3 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 a60be5363d62..87f9af39f5ba 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 1eb17345f09d..0765b6be0032 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/autofill/augmented/FillRequest.java b/core/java/android/service/autofill/augmented/FillRequest.java index 9a97bb203f5a..0b44470670de 100644 --- a/core/java/android/service/autofill/augmented/FillRequest.java +++ b/core/java/android/service/autofill/augmented/FillRequest.java @@ -81,6 +81,7 @@ public final class FillRequest { return mProxy.getSmartSuggestionParams(); } + @NonNull @Override public String toString() { return "FillRequest[act=" + getActivityComponent().flattenToShortString() diff --git a/core/java/android/service/autofill/augmented/PresentationParams.java b/core/java/android/service/autofill/augmented/PresentationParams.java index 334487dd6ab4..8b3a001f58e6 100644 --- a/core/java/android/service/autofill/augmented/PresentationParams.java +++ b/core/java/android/service/autofill/augmented/PresentationParams.java @@ -82,6 +82,7 @@ public abstract class PresentationParams { return mBounds; } + @NonNull @Override public String toString() { return mBounds.toString(); diff --git a/core/java/android/service/contentcapture/ActivityEvent.java b/core/java/android/service/contentcapture/ActivityEvent.java index fc781c2035f6..b741cff9328e 100644 --- a/core/java/android/service/contentcapture/ActivityEvent.java +++ b/core/java/android/service/contentcapture/ActivityEvent.java @@ -111,6 +111,7 @@ public final class ActivityEvent implements Parcelable { } } + @NonNull @Override public String toString() { return new StringBuilder("ActivityEvent[").append(mComponentName.toShortString()) diff --git a/core/java/android/service/euicc/EuiccProfileInfo.java b/core/java/android/service/euicc/EuiccProfileInfo.java index 702837b3083c..6c357ccdd03d 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 aa11445079cd..8ab687f0d001 100644 --- a/core/java/android/service/notification/Adjustment.java +++ b/core/java/android/service/notification/Adjustment.java @@ -257,6 +257,7 @@ public final class Adjustment implements Parcelable { dest.writeString(mIssuer); } + @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 2b4c24cbb069..8be114ca321e 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; @@ -266,7 +268,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; @@ -293,6 +295,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 938cc10fec2a..eb624c9d85f4 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 33b328393028..b3657c458ba7 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/core/java/android/service/watchdog/ExplicitHealthCheckService.java b/core/java/android/service/watchdog/ExplicitHealthCheckService.java index dc9c85808240..619c507c2bd3 100644 --- a/core/java/android/service/watchdog/ExplicitHealthCheckService.java +++ b/core/java/android/service/watchdog/ExplicitHealthCheckService.java @@ -229,13 +229,14 @@ public abstract class ExplicitHealthCheckService extends Service { return mHealthCheckTimeoutMillis; } + @NonNull @Override public String toString() { return "PackageConfig{" + mPackageName + ", " + mHealthCheckTimeoutMillis + "}"; } @Override - public boolean equals(Object other) { + public boolean equals(@Nullable Object other) { if (other == this) { return true; } diff --git a/core/java/android/view/contentcapture/ContentCaptureEvent.java b/core/java/android/view/contentcapture/ContentCaptureEvent.java index bd386292f95d..c29d251e6535 100644 --- a/core/java/android/view/contentcapture/ContentCaptureEvent.java +++ b/core/java/android/view/contentcapture/ContentCaptureEvent.java @@ -373,6 +373,7 @@ public final class ContentCaptureEvent implements Parcelable { } } + @NonNull @Override public String toString() { final StringBuilder string = new StringBuilder("ContentCaptureEvent[type=") diff --git a/location/java/android/location/GnssCapabilities.java b/location/java/android/location/GnssCapabilities.java index 36fe8dab5dea..2e2f98432d2e 100644 --- a/location/java/android/location/GnssCapabilities.java +++ b/location/java/android/location/GnssCapabilities.java @@ -16,6 +16,7 @@ package android.location; +import android.annotation.NonNull; import android.annotation.SystemApi; /** @@ -164,6 +165,7 @@ public final class GnssCapabilities { return hasCapability(MEASUREMENT_CORRECTIONS_REFLECTING_PLANE); } + @NonNull @Override public String toString() { StringBuilder sb = new StringBuilder("GnssCapabilities: ( "); diff --git a/location/java/android/location/GnssMeasurementCorrections.java b/location/java/android/location/GnssMeasurementCorrections.java index 3e32c21da23b..a23213ff260c 100644 --- a/location/java/android/location/GnssMeasurementCorrections.java +++ b/location/java/android/location/GnssMeasurementCorrections.java @@ -176,6 +176,7 @@ public final class GnssMeasurementCorrections implements Parcelable { } }; + @NonNull @Override public String toString() { final String format = " %-29s = %s\n"; diff --git a/location/java/android/location/GnssReflectingPlane.java b/location/java/android/location/GnssReflectingPlane.java index 9d05287f6b76..1acdd1ecce0b 100644 --- a/location/java/android/location/GnssReflectingPlane.java +++ b/location/java/android/location/GnssReflectingPlane.java @@ -107,6 +107,7 @@ public final class GnssReflectingPlane implements Parcelable { } }; + @NonNull @Override public String toString() { final String format = " %-29s = %s\n"; diff --git a/location/java/android/location/GnssSingleSatCorrection.java b/location/java/android/location/GnssSingleSatCorrection.java index e9019097e327..aeca562fced2 100644 --- a/location/java/android/location/GnssSingleSatCorrection.java +++ b/location/java/android/location/GnssSingleSatCorrection.java @@ -268,6 +268,7 @@ public final class GnssSingleSatCorrection implements Parcelable { } }; + @NonNull @Override public String toString() { final String format = " %-29s = %s\n"; diff --git a/location/java/android/location/GpsClock.java b/location/java/android/location/GpsClock.java index 52ba60e36ffd..f1237662a559 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 51718b85103a..27a81899bedc 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 1cd1fb4e3cb2..d69158d335f4 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 77f011374dab..6eeea2623a8b 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 2aa685cca757..f60e5c71ab16 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 a05d8501bc1f..0902acf176d4 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -734,6 +734,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 ee89509951df..675cf7360b82 100644 --- a/media/java/android/media/AudioFocusInfo.java +++ b/media/java/android/media/AudioFocusInfo.java @@ -17,6 +17,7 @@ package android.media; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.Parcel; @@ -155,7 +156,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/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index 9ac9411370ab..a62e847f320a 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -299,6 +299,7 @@ public final class AudioProductStrategy implements Parcelable { } }; + @NonNull @Override public String toString() { StringBuilder s = new StringBuilder(); diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index dec0140c0d5c..9685c4b56fc2 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -933,7 +933,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 5b316bedd134..b12f7c551288 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 f012b46a4a62..7ea93b4f2b23 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 e09eeb8537c1..ea00d6eff12e 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 6b9b83ddb887..8b8c86be7b0a 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 3a340053ace3..1c03d8089df7 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 10a04a9db260..028280c332e2 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 9546b63f040f..acf46815fb38 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3700,7 +3700,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 950ae6cf5ed8..c13801887572 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 3dd931898c18..407ced71a0e7 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 ec9f078367b8..7994c1b05977 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 2fae949cacb3..a76b8da09064 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 c35a485d613f..e6f107e28c98 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 5fb9bacb55b8..701a375a3039 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 cd4fbacd180e..90d443a6d8ee 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 e0838b375fdb..ec2050fb1a44 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 63bdac514477..b94cb60ffa00 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 37a4491141a0..811722f0bbff 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 fb1da7b12556..a0e949aa7fc5 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 17699d70cb18..9170e88ce832 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 c53ade16cae4..0d79ec98fcbb 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 b27f7756151d..c348cff25052 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 89842aefc66e..d5a05ae2dbb8 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 9b72d58aa89f..79cdfef96300 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 20879141bdb5..77ee20512d11 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -539,7 +539,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 44595b5bc1fd..6f062f4185f2 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 37b11eda6916..eb2ebcad2c1d 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 a478606da22a..036a7b329d77 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 32b4382829df..ec2ff6c58a40 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 9912eced0543..be34f9db3e54 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 fd75a6b192d2..c1f059e1cc89 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 2e4288d0cf0a..16303685d0a3 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 80fc09e2b0cc..87a5094a95f3 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 056a0abe7a29..20c191da0550 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 3b298bb82f8b..cd9ebbf38e35 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 52b51d243bd1..ac258cd40d65 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 6ce21216f753..6a03c73bc3f9 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 8262a7a36c56..95b2e77c5c1e 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 57dff9d761cb..a32bd547e1e2 100644 --- a/wifi/java/android/net/wifi/hotspot2/OsuProvider.java +++ b/wifi/java/android/net/wifi/hotspot2/OsuProvider.java @@ -16,6 +16,7 @@ package android.net.wifi.hotspot2; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.graphics.drawable.Icon; @@ -219,7 +220,7 @@ public final class OsuProvider implements Parcelable { } @Override - public boolean equals(Object thatObject) { + public boolean equals(@Nullable Object thatObject) { if (this == thatObject) { return true; } @@ -246,6 +247,7 @@ public final class OsuProvider implements Parcelable { mServerUri, mNetworkAccessIdentifier, mMethodList); } + @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 70af03e56262..318efa61a110 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 e6ae48344afc..64dfc3499aaf 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; } |