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

Commit 01e8b1e7 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Rename RadioNetworkConstants to NetworkConstants. 

Rename RadioNetworkConstants to NetworkConstants and some classes
inside it.
Added IWLAN as one RadioAccessNetwork type.

Bug: 64132030
Test: build
Change-Id: I02cfe1e4cc6a49842140d952a59f285b4c3a90ea
parent 96435130

src/java/com/android/internal/telephony/NetworkScanRequestTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.internal.telephony;



import static android.telephony.RadioNetworkConstants.RadioAccessNetworks.EUTRAN;

import static android.telephony.RadioNetworkConstants.RadioAccessNetworks.GERAN;

import static android.telephony.RadioNetworkConstants.RadioAccessNetworks.UTRAN;

import static android.telephony.AccessNetworkConstants.AccessNetworkType.EUTRAN;

import static android.telephony.AccessNetworkConstants.AccessNetworkType.GERAN;

import static android.telephony.AccessNetworkConstants.AccessNetworkType.UTRAN;



import android.hardware.radio.V1_0.RadioError;

import android.os.AsyncResult;

src/java/com/android/internal/telephony/RIL.java

+4 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.WorkSource;

import android.service.carrier.CarrierIdentifier;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.CellInfo;

import android.telephony.ClientRequestStats;

import android.telephony.ImsiEncryptionInfo;
@@ -76,7 +77,6 @@ import android.telephony.NetworkScanRequest; 
import android.telephony.PhoneNumberUtils;

import android.telephony.RadioAccessFamily;

import android.telephony.RadioAccessSpecifier;

import android.telephony.RadioNetworkConstants.RadioAccessNetworks;

import android.telephony.Rlog;

import android.telephony.SignalStrength;

import android.telephony.SmsManager;
@@ -1750,13 +1750,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        rasInHalFormat.radioAccessNetwork = ras.getRadioAccessNetwork();

        List<Integer> bands = null;

        switch (ras.getRadioAccessNetwork()) {

            case RadioAccessNetworks.GERAN:

            case AccessNetworkType.GERAN:

                bands = rasInHalFormat.geranBands;

                break;

            case RadioAccessNetworks.UTRAN:

            case AccessNetworkType.UTRAN:

                bands = rasInHalFormat.utranBands;

                break;

            case RadioAccessNetworks.EUTRAN:

            case AccessNetworkType.EUTRAN:

                bands = rasInHalFormat.eutranBands;

                break;

            default:

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

+7 −7
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import static org.junit.Assert.assertEquals; 


import android.os.Parcel;

import android.support.test.filters.SmallTest;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.EutranBand;

import android.telephony.AccessNetworkConstants.GeranBand;

import android.telephony.NetworkScanRequest;

import android.telephony.RadioAccessSpecifier;

import android.telephony.RadioNetworkConstants.EutranBands;

import android.telephony.RadioNetworkConstants.GeranBands;

import android.telephony.RadioNetworkConstants.RadioAccessNetworks;



import org.junit.Test;
@@ -37,12 +37,12 @@ public class NetworkScanRequestTest { 
    @Test

    @SmallTest

    public void testParcel() {

        int ranGsm = RadioAccessNetworks.GERAN;

        int[] gsmBands = {GeranBands.BAND_T380, GeranBands.BAND_T410};

        int ranGsm = AccessNetworkType.GERAN;

        int[] gsmBands = {GeranBand.BAND_T380, GeranBand.BAND_T410};

        int[] gsmChannels = {1, 2, 3, 4};

        RadioAccessSpecifier gsm = new RadioAccessSpecifier(ranGsm, gsmBands, gsmChannels);

        int ranLte = RadioAccessNetworks.EUTRAN;

        int[] lteBands = {EutranBands.BAND_10, EutranBands.BAND_11};

        int ranLte = AccessNetworkType.EUTRAN;

        int[] lteBands = {EutranBand.BAND_10, EutranBand.BAND_11};

        int[] lteChannels = {5, 6, 7, 8};

        RadioAccessSpecifier lte = new RadioAccessSpecifier(ranLte, lteBands, lteChannels);

        RadioAccessSpecifier[] ras = {gsm, lte};

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

+4 −4
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import static org.junit.Assert.assertEquals; 


import android.os.Parcel;

import android.support.test.filters.SmallTest;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.GeranBand;

import android.telephony.RadioAccessSpecifier;

import android.telephony.RadioNetworkConstants.GeranBands;

import android.telephony.RadioNetworkConstants.RadioAccessNetworks;



import org.junit.Test;
@@ -33,8 +33,8 @@ public class RadioAccessSpecifierTest { 
    @Test

    @SmallTest

    public void testParcel() {

        int ranGsm = RadioAccessNetworks.GERAN;

        int[] gsmBands = {GeranBands.BAND_T380, GeranBands.BAND_T410};

        int ranGsm = AccessNetworkType.GERAN;

        int[] gsmBands = {GeranBand.BAND_T380, GeranBand.BAND_T410};

        int[] gsmChannels = {1, 2, 3, 4};

        RadioAccessSpecifier ras = new RadioAccessSpecifier(ranGsm, gsmBands, gsmChannels);