diff options
| author | 2023-02-15 13:53:43 -0600 | |
|---|---|---|
| committer | 2023-08-02 14:08:37 -0500 | |
| commit | ee1c07cb07190cdc6ae7e838efa72810d7334e32 (patch) | |
| tree | 45aad81067221c4b0110147b89328d38b21b85f9 | |
| parent | 35d5d62deb89ef8abee0b80b6a8c01ab9ee2ef21 (diff) | |
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
Merged-In: I28d8a471b1da95c9eb59cddfcd1d932364a41c50
(cherry picked from commit 13951afeb6f4af574b3a0cfba96736ac4b298a03)
| -rw-r--r-- | core/api/current.txt | 6 | ||||
| -rw-r--r-- | telephony/java/android/telephony/PhysicalChannelConfig.java | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index abf3a2f0ddf8..f380bc4b695b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 diff --git a/telephony/java/android/telephony/PhysicalChannelConfig.java b/telephony/java/android/telephony/PhysicalChannelConfig.java index 212aaaed46b2..2c6d457916f1 100644 --- a/telephony/java/android/telephony/PhysicalChannelConfig.java +++ b/telephony/java/android/telephony/PhysicalChannelConfig.java @@ -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. */ |