| commit | bfe27b6dd26b73ec0cb903a6331ad0f9e1b13cba | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Tue Feb 06 03:18:56 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 06 03:18:56 2018 +0000 |
| tree | 525ecccfe7aef4e916f6fdd97dbea757091d0daf | |
| parent | 37c4d43602adb05eabc22b06e17293f13adbb120 [diff] | |
| parent | 08b0b2771a781f5b4873303332155f13bda9b942 [diff] |
Merge changes from topic "ims_apis" am: 27f0897068 am: 08b0b2771a Change-Id: Ia72994976f040097ae659232e56697ec6ba6e7e9
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;
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;