Merge "Moved 5G+ PCO related code to data modules" (91735689) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/PcoData.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ package android.telephony;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Arrays;
		import java.util.Objects;

		/**
		* Contains Carrier-specific (and opaque) Protocol configuration Option
		* Data. In general this is only passed on to carrier-specific applications
		@@ -84,4 +87,22 @@ public class PcoData implements Parcelable {
		return "PcoData(" + cid + ", " + bearerProto + ", " + pcoId + ", contents[" +
		contents.length + "])";
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		PcoData pcoData = (PcoData) o;
		return cid == pcoData.cid
		&& pcoId == pcoData.pcoId
		&& Objects.equals(bearerProto, pcoData.bearerProto)
		&& Arrays.equals(contents, pcoData.contents);
		}

		@Override
		public int hashCode() {
		int result = Objects.hash(cid, bearerProto, pcoId);
		result = 31 * result + Arrays.hashCode(contents);
		return result;
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -253,8 +253,10 @@ public class DataServiceCallback {
		return "RESULT_ERROR_BUSY";
		case RESULT_ERROR_ILLEGAL_STATE:
		return "RESULT_ERROR_ILLEGAL_STATE";
		case RESULT_ERROR_TEMPORARILY_UNAVAILABLE:
		return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE";
		default:
		return "Missing case for result code=" + resultCode;
		return "Unknown(" + resultCode + ")";
		}
		}