Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bffbcee8 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Moved 5G+ PCO related code to data modules" am: 91735689

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032904

Change-Id: Ia968bf8070695f8b53a1c14960784cc7bc78c832
parents eada5871 91735689
Loading
Loading
Loading
Loading
+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 + ")";
        }
    }