From aeb8a06c236e799a187d92e6f5270a1adec169f2 Mon Sep 17 00:00:00 2001 From: James Mattis Date: Mon, 17 Jan 2022 15:43:10 -0800 Subject: [PATCH] InternalNetworkManagementException Changes Update to InternalNetworkManagementException in order to allow all members to be parcelable. Bug: 210485380 Test: atest EthernetServiceTests Change-Id: I17f119a66face8a927546657490969aa3073c54b --- .../InternalNetworkManagementException.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/framework-t/src/android/net/InternalNetworkManagementException.java b/framework-t/src/android/net/InternalNetworkManagementException.java index 7f4e403f22..798e9c3b52 100644 --- a/framework-t/src/android/net/InternalNetworkManagementException.java +++ b/framework-t/src/android/net/InternalNetworkManagementException.java @@ -20,22 +20,34 @@ import android.annotation.NonNull; import android.os.Parcel; import android.os.Parcelable; +import java.util.Objects; + /** @hide */ public final class InternalNetworkManagementException extends RuntimeException implements Parcelable { /* @hide */ - public InternalNetworkManagementException(@NonNull final Throwable t) { - super(t); + public InternalNetworkManagementException(@NonNull final String errorMessage) { + super(errorMessage); } - private InternalNetworkManagementException(@NonNull final Parcel source) { - super(source.readString()); + @Override + public int hashCode() { + return Objects.hash(getMessage()); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + final InternalNetworkManagementException that = (InternalNetworkManagementException) obj; + + return Objects.equals(getMessage(), that.getMessage()); } @Override public void writeToParcel(@NonNull Parcel dest, int flags) { - dest.writeString(getCause().getMessage()); + dest.writeString(getMessage()); } @Override @@ -53,7 +65,7 @@ public final class InternalNetworkManagementException @Override public InternalNetworkManagementException createFromParcel(@NonNull Parcel source) { - return new InternalNetworkManagementException(source); + return new InternalNetworkManagementException(source.readString()); } }; }