From 0aed75aa774a98a37d81fa998fb8dbe6a566b207 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Thu, 4 Mar 2021 16:47:59 +0800 Subject: [PATCH] [Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX Bug: 181792548 Test: atest CellIdentityTest, atest CtsTelephonyTestCases:android.telephony.cts.PhysicalChannelConfigTest Change-Id: Idb22afc743e81d2fe38f0be683aeb7ca3398aa50 --- core/api/current.txt | 2 +- telephony/java/android/telephony/CellIdentity.java | 2 +- telephony/java/android/telephony/PhysicalChannelConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 8fe54b0372bb5..50a227a9cc92f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40452,7 +40452,7 @@ package android.telephony { method public void writeToParcel(@NonNull android.os.Parcel, int); 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 = -1; // 0xffffffff + 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 diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java index 1e5ce05ff28a4..518fabc09838a 100644 --- a/telephony/java/android/telephony/CellIdentity.java +++ b/telephony/java/android/telephony/CellIdentity.java @@ -37,7 +37,7 @@ import java.util.UUID; public abstract class CellIdentity implements Parcelable { /** @hide */ - public static final int INVALID_CHANNEL_NUMBER = -1; + public static final int INVALID_CHANNEL_NUMBER = Integer.MAX_VALUE; /** * parameters for validation diff --git a/telephony/java/android/telephony/PhysicalChannelConfig.java b/telephony/java/android/telephony/PhysicalChannelConfig.java index 9fb098ea87583..dfe269cbb0d9f 100644 --- a/telephony/java/android/telephony/PhysicalChannelConfig.java +++ b/telephony/java/android/telephony/PhysicalChannelConfig.java @@ -50,7 +50,7 @@ public final class PhysicalChannelConfig implements Parcelable { public static final int CONNECTION_UNKNOWN = -1; /** Channel number is unknown. */ - public static final int CHANNEL_NUMBER_UNKNOWN = -1; + public static final int CHANNEL_NUMBER_UNKNOWN = Integer.MAX_VALUE; /** Physical Cell Id is unknown. */ public static final int PHYSICAL_CELL_ID_UNKNOWN = -1;