commit 08b0b2771a781f5b4873303332155f13bda9b942
author Brad Ebinger <breadley@google.com> Mon Feb 05 23:21:49 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 05 23:21:49 2018 +0000
tree 50ea8eb0bd7f0dfef54373862be1d507eaa6b688
parent ddf1ea14a2758223489ad7efcf2585c4d1cd38a1
parent 27f0897068832bd0f117a25fdf84e54ce69a7d0e

Merge changes from topic "ims_apis"
am: 27f0897068

Change-Id: Ia5b69d632dd37d2e0e0df1e5d6b596cd882ba877

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 cb9ecbd..ff06005 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -36,10 +36,10 @@
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
+import android.telephony.ims.ImsCallProfile;
 import android.util.Pair;
 
 import com.android.ims.ImsCall;
-import com.android.ims.ImsCallProfile;
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallFailCause;
 import com.android.internal.telephony.CallStateException;

testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java

diff --git a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
index 6391e53..7e27371 100644
--- a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
+++ b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
@@ -27,8 +27,7 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
-
-import com.android.ims.ImsReasonInfo;
+import android.telephony.ims.ImsReasonInfo;
 
 import java.util.Map;