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

Commit 4af44021 authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Check HIDL Discriminator for CSG Info" into rvc-dev

parents 661d4706 f85a2e92

telephony/java/android/telephony/CellIdentityLte.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -153,8 +153,10 @@ public final class CellIdentityLte extends CellIdentity { 
                cid.bands.stream().mapToInt(Integer::intValue).toArray(), cid.base.bandwidth,

                cid.bands.stream().mapToInt(Integer::intValue).toArray(), cid.base.bandwidth,

                cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,

                cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,

                cid.base.operatorNames.alphaShort, cid.additionalPlmns,

                cid.base.operatorNames.alphaShort, cid.additionalPlmns,

                cid.optionalCsgInfo.csgInfo() != null

                cid.optionalCsgInfo.getDiscriminator()

                        ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null);

                        == android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo

                                ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())

                                        : null);

    }

    }





    private CellIdentityLte(@NonNull CellIdentityLte cid) {

    private CellIdentityLte(@NonNull CellIdentityLte cid) {

telephony/java/android/telephony/CellIdentityTdscdma.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -128,8 +128,11 @@ public final class CellIdentityTdscdma extends CellIdentity { 
        this(cid.base.base.mcc, cid.base.base.mnc, cid.base.base.lac, cid.base.base.cid,

        this(cid.base.base.mcc, cid.base.base.mnc, cid.base.base.lac, cid.base.base.cid,

                cid.base.base.cpid, cid.base.uarfcn, cid.base.operatorNames.alphaLong,

                cid.base.base.cpid, cid.base.uarfcn, cid.base.operatorNames.alphaLong,

                cid.base.operatorNames.alphaShort,

                cid.base.operatorNames.alphaShort,

                cid.additionalPlmns, cid.optionalCsgInfo.csgInfo() != null

                cid.additionalPlmns,

                        ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null);

                cid.optionalCsgInfo.getDiscriminator()

                        == android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo

                                ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())

                                        : null);

    }

    }





    /** @hide */

    /** @hide */

telephony/java/android/telephony/CellIdentityWcdma.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -123,8 +123,10 @@ public final class CellIdentityWcdma extends CellIdentity { 
        this(cid.base.base.lac, cid.base.base.cid, cid.base.base.psc, cid.base.base.uarfcn,

        this(cid.base.base.lac, cid.base.base.cid, cid.base.base.psc, cid.base.base.uarfcn,

                cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,

                cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,

                cid.base.operatorNames.alphaShort, cid.additionalPlmns,

                cid.base.operatorNames.alphaShort, cid.additionalPlmns,

                cid.optionalCsgInfo.csgInfo() != null

                cid.optionalCsgInfo.getDiscriminator()

                        ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null);

                        == android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo

                                ? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())

                                        : null);

    }

    }





    private CellIdentityWcdma(@NonNull CellIdentityWcdma cid) {

    private CellIdentityWcdma(@NonNull CellIdentityWcdma cid) {