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

Commit 13951afe authored by rambowang's avatar rambowang
Browse files

PhysicalChannelConfig: deprecate cell connection status enums 

These enums have duplication definitions as those defined in
CellInfo. Keep CellInfo as the single source of truth to
keep code healthy.

Bug: 72993578
Test: atest PhysicalChannelConfigTest
Change-Id: I28d8a471b1da95c9eb59cddfcd1d932364a41c50
parent bbd6a5ec

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -44849,9 +44849,9 @@ package android.telephony { 
    field public static final int BAND_UNKNOWN = 0; // 0x0

    field public static final int CELL_BANDWIDTH_UNKNOWN = 0; // 0x0

    field public static final int CHANNEL_NUMBER_UNKNOWN = 2147483647; // 0x7fffffff

    field public static final int CONNECTION_PRIMARY_SERVING = 1; // 0x1

    field public static final int CONNECTION_SECONDARY_SERVING = 2; // 0x2

    field public static final int CONNECTION_UNKNOWN = -1; // 0xffffffff

    field @Deprecated public static final int CONNECTION_PRIMARY_SERVING = 1; // 0x1

    field @Deprecated public static final int CONNECTION_SECONDARY_SERVING = 2; // 0x2

    field @Deprecated public static final int CONNECTION_UNKNOWN = -1; // 0xffffffff

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.PhysicalChannelConfig> CREATOR;

    field public static final int FREQUENCY_UNKNOWN = -1; // 0xffffffff

    field public static final int PHYSICAL_CELL_ID_MAXIMUM_VALUE = 1007; // 0x3ef

telephony/java/android/telephony/PhysicalChannelConfig.java

+12 −1
Original line number Diff line number Diff line
@@ -37,15 +37,26 @@ public final class PhysicalChannelConfig implements Parcelable { 


    /**

     * UE has connection to cell for signalling and possibly data (3GPP 36.331, 25.331).

     *

     * @deprecated Use {@link  CellInfo#CONNECTION_PRIMARY_SERVING} instead.

     */

    @Deprecated

    public static final int CONNECTION_PRIMARY_SERVING = 1;



    /**

     * UE has connection to cell for data (3GPP 36.331, 25.331).

     *

     * @deprecated Use {@link  CellInfo#CONNECTION_SECONDARY_SERVING} instead.

     */

    @Deprecated

    public static final int CONNECTION_SECONDARY_SERVING = 2;



    /** Connection status is unknown. */

    /**

     * Connection status is unknown.

     *

     * @deprecated Use {@link  CellInfo#CONNECTION_UNKNOWN} instead.

     */

    @Deprecated

    public static final int CONNECTION_UNKNOWN = -1;



    /** Channel number is unknown. */