commit 062e1cecf4cb6ef8bade4b2b9e6be05395ff469f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 03 03:22:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 03 03:22:07 2020 +0000
tree 29db6a98ac2073381a677a70dc04657317b3f857
parent 6f82a0d7c77436f6869b83722ceb1235e281df5f
parent adb90684b5cac8d0cd6539b3eeec23ebb7a51bfa

Merge "Moved RilRadioTechnology annotation" am: 1945137f47 am: adb90684b5

Change-Id: I52bd58dccb1cb8f91472aee81e99c9fcf1f811c8

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index fb865b4..14f0cb8 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -37,12 +37,12 @@
 import android.telecom.StatusHints;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-import android.telephony.Annotation.RilRadioTechnology;
 import android.telephony.CarrierConfigManager;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.Rlog;
 import android.telephony.ServiceState;
+import android.telephony.ServiceState.RilRadioTechnology;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsCallProfile;