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

Commit 97e8c26d authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Fix Invalid Range Parameters in CellIdentity" 

am: f7c3ffff

Change-Id: I2b945733f1a916e59ef2a37893c34cef942c2ef1
parents 180cbdc2 f7c3ffff

tests/telephonytests/src/com/android/internal/telephony/CellIdentityLteTest.java

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.test.suitebuilder.annotation.SmallTest; 


public class CellIdentityLteTest extends AndroidTestCase {



    // Cell identity ranges from 0 to 268435456.

    private static final int CI = 268435456;

    // Cell identity ranges from 0 to 268435455.

    private static final int CI = 268435455;

    // Physical cell id ranges from 0 to 503.

    private static final int PCI = 503;

    // Tracking area code ranges from 0 to 65535.

tests/telephonytests/src/com/android/internal/telephony/CellIdentityTdscdmaTest.java

+3 −3
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
    private static final int PCI = 503;

    // Tracking area code ranges from 0 to 65535.

    private static final int TAC = 65535;

    // Absolute RF Channel Number ranges from 0 to 262140.

    private static final int UARFCN = 262140;

    // Absolute RF Channel Number ranges from 0 to 16383.

    private static final int UARFCN = 16383;

    private static final int MCC = 120;

    private static final int MNC = 260;

    private static final String MCC_STR = "120";
@@ -46,7 +46,7 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
    // UMTS Cell Identity ranges from 0 to 268435455.

    private static final int CID = 268435455;



    private static final int CPID = 12345;

    private static final int CPID = 127;



    @SmallTest

    public void testDefaultConstructor() {

tests/telephonytests/src/com/android/internal/telephony/CellIdentityWcdmaTest.java

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
    private static final int CID = 268435455;

    // Primary Scrambling Coderanges from 0 to 511.

    private static final int PSC = 511;

    // UMTS Absolute RF Channel Number ranges from 0 to 65535.

    private static final int UARFCN = 65535;

    // UMTS Absolute RF Channel Number ranges from 0 to 65383.

    private static final int UARFCN = 16383;

    private static final int MCC = 120;

    private static final int MNC = 260;

    private static final String MCC_STR = "120";