commit c7b18ecab06dbddd1a711a9bdb823ea2fff77e59
author Chen Xu <fionaxu@google.com> Thu Sep 26 22:48:11 2019 -0700
committer Chen Xu <fionaxu@google.com> Mon Oct 21 18:29:20 2019 -0700
tree a458401134b2825d35fe93800179b609975010b8
parent 6f51c6caa1972cdb99df58a3c5a6f3abd4caf675

new telephony annotation class

This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotation to a separate class and having
other module statically link to it.

Bug: 140908357
Test: Build
Change-Id: Ib4e774fc93c0b3ebed70775d4a613621b9c7778a
(cherry picked from commit 227e06fdddecc8394f7a87d9b585575cc29acd27)
Merged-in: Ib4e774fc93c0b3ebed70775d4a613621b9c7778a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e5e9fe7..2b222f6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -61,6 +61,7 @@
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telephony.Annotation.ApnType;
 import android.telephony.CarrierConfigManager;
 import android.telephony.CarrierRestrictionRules;
 import android.telephony.CellInfo;
@@ -92,7 +93,6 @@
 import android.telephony.VisualVoicemailSmsFilterSettings;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.data.ApnSetting;
-import android.telephony.data.ApnSetting.ApnType;
 import android.telephony.emergency.EmergencyNumber;
 import android.telephony.gsm.GsmCellLocation;
 import android.telephony.ims.ImsException;