Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moved RilRadioTechnology annotation"

Browse Source 
am: d031947100

Change-Id: I2d52c03374a8395dc9fb5fefc6eaeb863162f342
This commit is contained in:
Daniel Bright
2020-01-02 19:06:40 -08:00
committed by android-build-merger
parent a457a78ab7 d031947100
commit 11caff98ff
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telecomm/java/android/telecom/Conference.java
View File

@@ -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;

25
telephony/java/android/telephony/Annotation.java
View File

@@ -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,

31
telephony/java/android/telephony/ServiceState.java
View File

@@ -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;
@@ -220,6 +219,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.
*/