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

Commit 4fcd48db authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a4 

am: 8208b2ef

Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9
parents a7e7cfde 8208b2ef

telephony/java/android/telephony/ServiceState.java

+35 −2
Original line number Original line Diff line number Diff line
@@ -22,13 +22,13 @@ import android.annotation.SystemApi; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.text.TextUtils;

import android.text.TextUtils;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.util.Arrays;



import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.List;





/**

/**
@@ -1339,6 +1339,39 @@ public class ServiceState implements Parcelable { 
        }

        }

    }

    }





    /** @hide */

    public static int rilRadioTechnologyToAccessNetworkType(@RilRadioTechnology int rt) {

        switch(rt) {

            case RIL_RADIO_TECHNOLOGY_GPRS:

            case RIL_RADIO_TECHNOLOGY_EDGE:

            case RIL_RADIO_TECHNOLOGY_GSM:

                return AccessNetworkType.GERAN;

            case RIL_RADIO_TECHNOLOGY_UMTS:

            case RIL_RADIO_TECHNOLOGY_HSDPA:

            case RIL_RADIO_TECHNOLOGY_HSPAP:

            case RIL_RADIO_TECHNOLOGY_HSUPA:

            case RIL_RADIO_TECHNOLOGY_HSPA:

            case RIL_RADIO_TECHNOLOGY_TD_SCDMA:

                return AccessNetworkType.UTRAN;

            case RIL_RADIO_TECHNOLOGY_IS95A:

            case RIL_RADIO_TECHNOLOGY_IS95B:

            case RIL_RADIO_TECHNOLOGY_1xRTT:

            case RIL_RADIO_TECHNOLOGY_EVDO_0:

            case RIL_RADIO_TECHNOLOGY_EVDO_A:

            case RIL_RADIO_TECHNOLOGY_EVDO_B:

            case RIL_RADIO_TECHNOLOGY_EHRPD:

                return AccessNetworkType.CDMA2000;

            case RIL_RADIO_TECHNOLOGY_LTE:

            case RIL_RADIO_TECHNOLOGY_LTE_CA:

                return AccessNetworkType.EUTRAN;

            case RIL_RADIO_TECHNOLOGY_IWLAN:

                return AccessNetworkType.IWLAN;

            case RIL_RADIO_TECHNOLOGY_UNKNOWN:

            default:

                return AccessNetworkType.UNKNOWN;

        }

    }



    /** @hide */

    /** @hide */

    public int getDataNetworkType() {

    public int getDataNetworkType() {

        return rilRadioTechnologyToNetworkType(mRilDataRadioTechnology);

        return rilRadioTechnologyToNetworkType(mRilDataRadioTechnology);

telephony/java/com/android/internal/telephony/RILConstants.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -220,11 +220,6 @@ public interface RILConstants { 
    String SETUP_DATA_PROTOCOL_IPV6   = "IPV6";

    String SETUP_DATA_PROTOCOL_IPV6   = "IPV6";

    String SETUP_DATA_PROTOCOL_IPV4V6 = "IPV4V6";

    String SETUP_DATA_PROTOCOL_IPV4V6 = "IPV4V6";





    /* Deactivate data call reasons */

    int DEACTIVATE_REASON_NONE = 0;

    int DEACTIVATE_REASON_RADIO_OFF = 1;

    int DEACTIVATE_REASON_PDP_RESET = 2;



    /* NV config radio reset types. */

    /* NV config radio reset types. */

    int NV_CONFIG_RELOAD_RESET = 1;

    int NV_CONFIG_RELOAD_RESET = 1;

    int NV_CONFIG_ERASE_RESET = 2;

    int NV_CONFIG_ERASE_RESET = 2;