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

Commit 5893160b authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "PhysicalChannelConfig: deprecate cell connection status enums" into main am: c4335910 

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



Change-Id: Id05029935c2b2035bd6af01405d54d197d2b8391
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a0ec320 c4335910

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -42930,9 +42930,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. */