Fix compilation errors (1f58f8e7) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/AccountSelection.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,6 @@ public class AccountSelection extends Activity {
	PhoneAccountHandle accountHandle = getItem(position);		PhoneAccountHandle accountHandle = getItem(position);
	PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle);		PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle);
	textView.setText(account.getLabel());		textView.setText(account.getLabel());
	imageView.setImageDrawable(account.getIcon(mContext));
	return rowView;		return rowView;
	}		}

src/com/android/server/telecom/BluetoothPhoneService.java

+36 −36

src/com/android/server/telecom/Call.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -406,7 +406,6 @@ final class Call implements CreateConnectionResponse {
	getChildCalls().size(),		getChildCalls().size(),
	getParentCall() != null,		getParentCall() != null,
	Connection.capabilitiesToString(getConnectionCapabilities()),		Connection.capabilitiesToString(getConnectionCapabilities()),
	PhoneCapabilities.toString(getCallCapabilities()),
	mIsActiveSub,		mIsActiveSub,
	mTargetPhoneAccountHandle,		mTargetPhoneAccountHandle,
	getCallSubstate());		getCallSubstate());

src/com/android/server/telecom/CallLogManager.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import android.net.Uri;
	import android.os.AsyncTask;		import android.os.AsyncTask;
	import android.provider.CallLog.Calls;		import android.provider.CallLog.Calls;
	import android.telecom.CallState;		import android.telecom.CallState;
			import android.telecom.Connection;
	import android.telecom.DisconnectCause;		import android.telecom.DisconnectCause;
	import android.telecom.PhoneAccountHandle;		import android.telecom.PhoneAccountHandle;
	import android.telecom.VideoProfile;		import android.telecom.VideoProfile;
	@@ -145,8 +146,8 @@ final class CallLogManager extends CallsManagerListenerBase {
	final int presentation = getPresentation(call);		final int presentation = getPresentation(call);
	final PhoneAccountHandle accountHandle = call.getTargetPhoneAccount();		final PhoneAccountHandle accountHandle = call.getTargetPhoneAccount();

	int volteCapabilities = call.getCallCapabilities() & PhoneCapabilities.VoLTE;		int volteCapabilities = call.getConnectionCapabilities() & Connection.CAPABILITY_VoLTE;
	Log.d(TAG, "callCapabilities: " + call.getCallCapabilities()		Log.d(TAG, "callCapabilities: " + call.getConnectionCapabilities()
	+ "volteCapability: " + volteCapabilities);		+ "volteCapability: " + volteCapabilities);
	if (volteCapabilities != 0){		if (volteCapabilities != 0){
	switch (callLogType) {		switch (callLogType) {

src/com/android/server/telecom/CallsManager.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.server.telecom;		package com.android.server.telecom;

	import android.content.Context;		import android.content.Context;
			import android.content.Intent;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	@@ -38,7 +39,6 @@ import android.telecom.TelecomManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;

	import com.android.internal.telephony.CallStateException;		import com.android.internal.telephony.CallStateException;
	import com.android.internal.telephony.Connection;
	import com.android.internal.telephony.PhoneConstants;		import com.android.internal.telephony.PhoneConstants;
	import com.android.internal.telephony.TelephonyProperties;		import com.android.internal.telephony.TelephonyProperties;
	import com.android.internal.telephony.util.BlacklistUtils;		import com.android.internal.telephony.util.BlacklistUtils;
	@@ -659,7 +659,7 @@ public final class CallsManager extends Call.ListenerBase {
	if (activeCall != null && activeCall != call &&		if (activeCall != null && activeCall != call &&
	(activeCall.isActive() \|\|		(activeCall.isActive() \|\|
	activeCall.getState() == CallState.DIALING)) {		activeCall.getState() == CallState.DIALING)) {
	if (0 == (activeCall.getConnectionCapabilities() & Connection.HOLD)) {		if (0 == (activeCall.getConnectionCapabilities() & Connection.CAPABILITY_HOLD)) {
	// This call does not support hold. If it is from a different connection		// This call does not support hold. If it is from a different connection
	// service, then disconnect it, otherwise allow the connection service to		// service, then disconnect it, otherwise allow the connection service to
	// figure out the right states.		// figure out the right states.
	@@ -1694,7 +1694,7 @@ public final class CallsManager extends Call.ListenerBase {
	return true;		return true;
	}		}
	// Try to hold the live call before attempting the new outgoing call.		// Try to hold the live call before attempting the new outgoing call.
	if (liveCall.can(PhoneCapabilities.HOLD)) {		if (liveCall.can(Connection.CAPABILITY_HOLD)) {
	liveCall.hold();		liveCall.hold();
	return true;		return true;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ public final class BluetoothPhoneService extends Service {
	private String mRingingAddress = null;		private String mRingingAddress = null;
	private int mRingingAddressType = 0;		private int mRingingAddressType = 0;
	private Call mOldHeldCall = null;		private Call mOldHeldCall = null;
	private static final long INVALID_SUBID = SubscriptionManager.INVALID_SUB_ID;		private static final int INVALID_SUBID = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
	private static final int[] LIVE_CALL_STATES =		private static final int[] LIVE_CALL_STATES =
	{CallState.CONNECTING, CallState.DIALING, CallState.ACTIVE};		{CallState.CONNECTING, CallState.DIALING, CallState.ACTIVE};

	@@ -313,9 +313,9 @@ public final class BluetoothPhoneService extends Service {
	PhoneAccountHandle ph = account.getAccountHandle();		PhoneAccountHandle ph = account.getAccountHandle();
	if (ph != null) {		if (ph != null) {
	String subId = ph.getId();		String subId = ph.getId();
	Long sub = SubscriptionManager.getDefaultVoiceSubId();		int sub = SubscriptionManager.getDefaultVoiceSubId();
	try {		try {
	sub = Long.parseLong(subId);		sub = Integer.parseInt(subId);
	} catch (NumberFormatException e){		} catch (NumberFormatException e){
	Log.w(this, " NumberFormatException " + e);		Log.w(this, " NumberFormatException " + e);
	}		}
	@@ -794,18 +794,18 @@ public final class BluetoothPhoneService extends Service {
	boolean isActive = false;		boolean isActive = false;
	boolean allowDsda = false;		boolean allowDsda = false;
	int state = convertCallState(call.getState(), isForeground);		int state = convertCallState(call.getState(), isForeground);
	long activeSub = mTelecomManager.getActiveSubscription();		int activeSub = mTelecomManager.getActiveSubscription();
	if (INVALID_SUBID == activeSub) {		if (INVALID_SUBID == activeSub) {
	Log.i(TAG, "Invalid activeSub id, returning");		Log.i(TAG, "Invalid activeSub id, returning");
	return;		return;
	}		}

	Call activeSubForegroundCall = callsManager.getFirstCallWithStateUsingSubId(		Call activeSubForegroundCall = callsManager.getFirstCallWithStateUsingSubId(
	Long.toString(activeSub), LIVE_CALL_STATES);		Integer.toString(activeSub), LIVE_CALL_STATES);
	Call activeSubRingingCall = callsManager.getFirstCallWithStateUsingSubId(		Call activeSubRingingCall = callsManager.getFirstCallWithStateUsingSubId(
	Long.toString(activeSub), CallState.RINGING);		Integer.toString(activeSub), CallState.RINGING);
	Call activeSubBackgroundCall = callsManager.getFirstCallWithStateUsingSubId(		Call activeSubBackgroundCall = callsManager.getFirstCallWithStateUsingSubId(
	Long.toString(activeSub), CallState.ON_HOLD);		Integer.toString(activeSub), CallState.ON_HOLD);

	if (getBluetoothCallStateForUpdate() != CALL_STATE_IDLE) {		if (getBluetoothCallStateForUpdate() != CALL_STATE_IDLE) {
	allowDsda = true;		allowDsda = true;
	@@ -833,8 +833,8 @@ public final class BluetoothPhoneService extends Service {
	Call activeChild = conferenceCall.getConferenceLevelActiveCall();		Call activeChild = conferenceCall.getConferenceLevelActiveCall();
	if (state == CALL_STATE_ACTIVE && activeChild != null) {		if (state == CALL_STATE_ACTIVE && activeChild != null) {