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

Commit e7c249e0 authored by Daniel Bright's avatar Daniel Bright Committed by Android (Google) Code Review
Browse files

Merge "Moved RilRadioTechnology annotation"

parents d130e3aa d75d5344

telecomm/java/android/telecom/Conference.java

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.SystemClock;

import android.telecom.Connection.VideoProvider;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.util.ArraySet;



import java.util.ArrayList;

telephony/java/android/telephony/Annotation.java

+0 −25
Original line number Diff line number Diff line
@@ -565,31 +565,6 @@ public class Annotation { 
    public @interface PreciseDisconnectCauses {

    }



    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"RIL_RADIO_TECHNOLOGY_" }, value = {

            ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN,

            ServiceState.RIL_RADIO_TECHNOLOGY_GPRS,

            ServiceState.RIL_RADIO_TECHNOLOGY_EDGE,

            ServiceState.RIL_RADIO_TECHNOLOGY_UMTS,

            ServiceState.RIL_RADIO_TECHNOLOGY_IS95A,

            ServiceState.RIL_RADIO_TECHNOLOGY_IS95B,

            ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT,

            ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0,

            ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A,

            ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA,

            ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA,

            ServiceState.RIL_RADIO_TECHNOLOGY_HSPA,

            ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B,

            ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD,

            ServiceState.RIL_RADIO_TECHNOLOGY_LTE,

            ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP,

            ServiceState.RIL_RADIO_TECHNOLOGY_GSM,

            ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA,

            ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN,

            ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,

            ServiceState.RIL_RADIO_TECHNOLOGY_NR})

    public @interface RilRadioTechnology {}



    @IntDef({

            Connection.AUDIO_CODEC_NONE,

            Connection.AUDIO_CODEC_AMR,

telephony/java/android/telephony/ServiceState.java

+30 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.Parcelable; 
import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.NetworkRegistrationInfo.Domain;

import android.telephony.NetworkRegistrationInfo.NRState;

import android.text.TextUtils;
@@ -228,6 +227,36 @@ public class ServiceState implements Parcelable { 
     */

    public static final int  RIL_RADIO_TECHNOLOGY_NR = 20;



    /**

     * RIL Radio Annotation

     * @hide

     */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"RIL_RADIO_TECHNOLOGY_" }, value = {

        ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN,

        ServiceState.RIL_RADIO_TECHNOLOGY_GPRS,

        ServiceState.RIL_RADIO_TECHNOLOGY_EDGE,

        ServiceState.RIL_RADIO_TECHNOLOGY_UMTS,

        ServiceState.RIL_RADIO_TECHNOLOGY_IS95A,

        ServiceState.RIL_RADIO_TECHNOLOGY_IS95B,

        ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT,

        ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0,

        ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A,

        ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA,

        ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA,

        ServiceState.RIL_RADIO_TECHNOLOGY_HSPA,

        ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B,

        ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD,

        ServiceState.RIL_RADIO_TECHNOLOGY_LTE,

        ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP,

        ServiceState.RIL_RADIO_TECHNOLOGY_GSM,

        ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA,

        ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN,

        ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,

        ServiceState.RIL_RADIO_TECHNOLOGY_NR})

    public @interface RilRadioTechnology {}





    /**

     * The number of the radio technologies.

     */