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

Commit 7d90db3c authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" am: 761614c8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8661a8355fc293faab2ca62c938e5a3ae9d840ae
parents 8d07cea9 761614c8

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40474,7 +40474,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

telephony/java/android/telephony/CellIdentity.java

+1 −1
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/PhysicalChannelConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -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;