From dba2aa6e6c5106199f432d744c568edcdf1379fb Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Fri, 20 Dec 2019 10:30:18 -0800 Subject: Moved RilRadioTechnology annotation Moved annotation from Annotation to ServiceState Bug: 146084549 Test: FrameworkTests, TeleServiceTests Change-Id: I2411052465204d87cb5982102df0fd1af012a97c Merged-In: I2411052465204d87cb5982102df0fd1af012a97c --- telecomm/java/android/telecom/Conference.java | 3 --- telephony/java/android/telephony/Annotation.java | 25 ----------------- telephony/java/android/telephony/ServiceState.java | 31 +++++++++++++++++++++- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 58abf0051539..456290cd772a 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -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; diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index 9b9997f9b737..06596659eb69 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -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, diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index d7d85c280e19..1014571bc41a 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -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. */ -- cgit v1.2.3-59-g8ed1b