API Cleanup: Remove use of VideoState class.
Bug: 21573551
Change-Id: Iac8f9f7010a6b04f25c92ea6c2eeb38033f95c34
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index b9135c8..a619701 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -36,7 +36,6 @@
import android.telecom.PhoneAccountHandle;
import android.telecom.VideoProfile;
import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import android.util.Log;
@@ -62,7 +61,6 @@
import com.android.internal.telephony.TelephonyCapabilities;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.sip.SipPhone;
-import com.android.internal.telephony.uicc.UiccCard;
import com.android.phone.CallGatewayManager.RawGatewayInfo;
import com.android.services.telephony.TelephonyConnectionService;
@@ -613,7 +611,7 @@
final boolean initiallyIdle = app.mCM.getState() == PhoneConstants.State.IDLE;
try {
- connection = app.mCM.dial(phone, numberToDial, VideoProfile.VideoState.AUDIO_ONLY);
+ connection = app.mCM.dial(phone, numberToDial, VideoProfile.STATE_AUDIO_ONLY);
} catch (CallStateException ex) {
// CallStateException means a new outgoing call is not currently
// possible: either no more call slots exist, or there's another
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index b0785d4..38cb4a3 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -16,11 +16,9 @@
package com.android.services.telephony;
-import android.content.ComponentName;
import android.content.Context;
import android.graphics.drawable.Icon;
import android.net.Uri;
-import android.telecom.Conference.Listener;
import android.telecom.Conference;
import android.telecom.ConferenceParticipant;
import android.telecom.Connection.VideoProvider;
@@ -303,7 +301,7 @@
if (mConferenceHost != null) {
return mConferenceHost.getVideoState();
}
- return VideoProfile.VideoState.AUDIO_ONLY;
+ return VideoProfile.STATE_AUDIO_ONLY;
}
/**
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index b5610e5..a52418c 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -272,7 +272,7 @@
/**
* For video calls, indicates whether the outgoing video for the call can be paused using
- * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+ * the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
*/
private boolean mIsVideoPauseSupported;
@@ -924,7 +924,7 @@
/**
* For video calls, sets whether this connection supports pausing the outgoing video for the
- * call using the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+ * call using the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
*
* @param isVideoPauseSupported {@code true} if pause state supported, {@code false} otherwise.
*/