Merge "Remove SipPhone." (fb40b445) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CallManager.java

+11 −32

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.telephony.ServiceState;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.imsphone.ImsPhoneConnection;
		import com.android.internal.telephony.sip.SipPhone;
		import com.android.telephony.Rlog;

		import java.util.ArrayList;
		@@ -501,11 +500,6 @@ public class CallManager {
		}

		int newAudioMode = AudioManager.MODE_IN_CALL;
		if (offhookPhone instanceof SipPhone) {
		Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP call!");
		// enable IN_COMMUNICATION audio mode instead for sipPhone
		newAudioMode = AudioManager.MODE_IN_COMMUNICATION;
		}
		int currMode = audioManager.getMode();
		if (currMode != newAudioMode \|\| mSpeedUpAudioForMtCall) {
		// request audio focus before setting the new mode
		@@ -740,9 +734,7 @@ public class CallManager {

		Phone fgPhone = getFgPhone(subId);
		if (fgPhone != null) {
		if (fgPhone instanceof SipPhone) {
		((SipPhone) fgPhone).conference(heldCall);
		} else if (canConference(heldCall)) {
		if (canConference(heldCall)) {
		fgPhone.conference();
		} else {
		throw(new CallStateException("Can't conference foreground and selected background call"));
		@@ -1673,8 +1665,7 @@ public class CallManager {
		}

		/**
		* Return true if there is at least one active foreground call
		* on a particular subId or an active sip call
		* Return true if there is at least one active foreground call on a particular subId
		*/
		@UnsupportedAppUsage
		public boolean hasActiveFgCall(int subId) {
		@@ -1692,8 +1683,7 @@ public class CallManager {
		}

		/**
		* Return true if there is at least one active background call
		* on a particular subId or an active sip call
		* Return true if there is at least one active background call on a particular subId
		*/
		@UnsupportedAppUsage
		public boolean hasActiveBgCall(int subId) {
		@@ -1770,8 +1760,7 @@ public class CallManager {
		private Call getFirstNonIdleCall(List<Call> calls, int subId) {
		Call result = null;
		for (Call call : calls) {
		if ((call.getPhone().getSubId() == subId) \|\|
		(call.getPhone() instanceof SipPhone)) {
		if (call.getPhone().getSubId() == subId) {
		if (!call.isIdle()) {
		return call;
		} else if (call.getState() != Call.State.IDLE) {
		@@ -1812,8 +1801,7 @@ public class CallManager {
		*
		* Active call means the call is NOT idle defined by Call.isIdle()
		*
		* 1. If there is only one active background call on given sub or
		* on SIP Phone, return it
		* 1. If there is only one active background call on given sub, return it
		* 2. If there is more than one active background call, return the background call
		* associated with the active sub.
		* 3. If there is no background call at all, return null.
		@@ -1983,8 +1971,7 @@ public class CallManager {
		*/
		private Call getFirstActiveCall(ArrayList<Call> calls, int subId) {
		for (Call call : calls) {
		if ((!call.isIdle()) && ((call.getPhone().getSubId() == subId) \|\|
		(call.getPhone() instanceof SipPhone))) {
		if ((!call.isIdle()) && (call.getPhone().getSubId() == subId)) {
		return call;
		}
		}
		@@ -2009,9 +1996,7 @@ public class CallManager {
		private Call getFirstCallOfState(ArrayList<Call> calls, Call.State state,
		int subId) {
		for (Call call : calls) {
		if ((call.getState() == state) \|\|
		((call.getPhone().getSubId() == subId) \|\|
		(call.getPhone() instanceof SipPhone))) {
		if ((call.getState() == state) \|\| (call.getPhone().getSubId() == subId)) {
		return call;
		}
		}
		@@ -2032,17 +2017,14 @@ public class CallManager {
		/**
		* @return true if more than one active ringing call exists on
		* the active subId.
		* This checks for the active calls on provided
		* subId and also active calls on SIP Phone.
		* This checks for the active calls on provided subId.
		*
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private boolean hasMoreThanOneRingingCall(int subId) {
		int count = 0;
		for (Call call : mRingingCalls) {
		if ((call.getState().isRinging()) &&
		((call.getPhone().getSubId() == subId) \|\|
		(call.getPhone() instanceof SipPhone))) {
		if ((call.getState().isRinging()) && (call.getPhone().getSubId() == subId)) {
		if (++count > 1) return true;
		}
		}
		@@ -2052,16 +2034,13 @@ public class CallManager {
		/**
		* @return true if more than one active background call exists on
		* the provided subId.
		* This checks for the background calls on provided
		* subId and also background calls on SIP Phone.
		* This checks for the background calls on provided subId.
		*
		*/
		private boolean hasMoreThanOneHoldingCall(int subId) {
		int count = 0;
		for (Call call : mBackgroundCalls) {
		if ((call.getState() == Call.State.HOLDING) &&
		((call.getPhone().getSubId() == subId) \|\|
		(call.getPhone() instanceof SipPhone))) {
		if ((call.getState() == Call.State.HOLDING) && (call.getPhone().getSubId() == subId)) {
		if (++count > 1) return true;
		}
		}

src/java/com/android/internal/telephony/PhoneFactory.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ import com.android.internal.telephony.imsphone.ImsPhone;
		import com.android.internal.telephony.imsphone.ImsPhoneFactory;
		import com.android.internal.telephony.metrics.MetricsCollector;
		import com.android.internal.telephony.metrics.TelephonyMetrics;
		import com.android.internal.telephony.sip.SipPhone;
		import com.android.internal.telephony.sip.SipPhoneFactory;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.util.NotificationChannelController;
		import com.android.internal.util.IndentingPrintWriter;
		@@ -412,15 +410,6 @@ public class PhoneFactory {
		}
		}

		/**
		* Makes a {@link SipPhone} object.
		* @param sipUri the local SIP URI the phone runs on
		* @return the {@code SipPhone} object or null if the SIP URI is not valid
		*/
		public static SipPhone makeSipPhone(String sipUri) {
		return SipPhoneFactory.makePhone(sipUri, sContext, sPhoneNotifier);
		}

		/**
		* Returns the preferred network type bitmask that should be set in the modem.
		*

src/java/com/android/internal/telephony/sip/SipCallBase.java

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony.sip;

		import com.android.internal.telephony.Call;

		abstract class SipCallBase extends Call {

		@Override
		public boolean isMultiparty() {
		return getConnectionsCount() > 1;
		}

		@Override
		public String toString() {
		return mState.toString() + ":" + super.toString();
		}
		}

src/java/com/android/internal/telephony/sip/SipCommandInterface.java

deleted100644 → 0

+0 −695

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony.sip;

		import android.content.Context;
		import android.net.KeepalivePacketData;
		import android.net.LinkProperties;
		import android.os.Handler;
		import android.os.Message;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.NetworkScanRequest;
		import android.telephony.SignalThresholdInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.data.DataProfile;
		import android.telephony.data.NetworkSliceInfo;
		import android.telephony.data.TrafficDescriptor;
		import android.telephony.emergency.EmergencyNumber;

		import com.android.internal.telephony.BaseCommands;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.PersoSubState;

		/**
		* SIP doesn't need CommandsInterface. The class does nothing but made to work
		* with Phone's constructor.
		*/
		class SipCommandInterface extends BaseCommands implements CommandsInterface {
		SipCommandInterface(Context context) {
		super(context);
		}

		@Override public void setOnNITZTime(Handler h, int what, Object obj) {
		}

		@Override
		public void getIccCardStatus(Message result) {
		}

		@Override
		public void getIccSlotsStatus(Message result) {
		}

		@Override
		public void setLogicalToPhysicalSlotMapping(int[] physicalSlots, Message result) {
		}

		@Override
		public void supplyIccPin(String pin, Message result) {
		}

		@Override
		public void supplyIccPuk(String puk, String newPin, Message result) {
		}

		@Override
		public void supplyIccPin2(String pin, Message result) {
		}

		@Override
		public void supplyIccPuk2(String puk, String newPin2, Message result) {
		}

		@Override
		public void changeIccPin(String oldPin, String newPin, Message result) {
		}

		@Override
		public void changeIccPin2(String oldPin2, String newPin2, Message result) {
		}

		@Override
		public void changeBarringPassword(String facility, String oldPwd,
		String newPwd, Message result) {
		}

		@Override
		public void supplyNetworkDepersonalization(String netpin, Message result) {
		}

		@Override
		public void supplySimDepersonalization(PersoSubState persoType,
		String controlKey, Message result) {
		}

		@Override
		public void getCurrentCalls(Message result) {
		}

		@Override
		@Deprecated public void getPDPContextList(Message result) {
		}

		@Override
		public void getDataCallList(Message result) {
		}

		@Override
		public void dial(String address, boolean isEmergencyCall, EmergencyNumber emergencyNumberInfo,
		boolean hasKnownUserIntentEmergency, int clirMode, Message result) {
		}

		@Override
		public void dial(String address, boolean isEmergencyCall, EmergencyNumber emergencyNumberInfo,
		boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo,
		Message result) {
		}

		@Override
		public void getIMSI(Message result) {
		}

		@Override
		public void getIMSIForApp(String aid, Message result) {
		}

		@Override
		public void getIMEI(Message result) {
		}

		@Override
		public void getIMEISV(Message result) {
		}


		@Override
		public void hangupConnection (int gsmIndex, Message result) {
		}

		@Override
		public void hangupWaitingOrBackground (Message result) {
		}

		@Override
		public void hangupForegroundResumeBackground (Message result) {
		}

		@Override
		public void switchWaitingOrHoldingAndActive (Message result) {
		}

		@Override
		public void conference (Message result) {
		}


		@Override
		public void setPreferredVoicePrivacy(boolean enable, Message result) {
		}

		@Override
		public void getPreferredVoicePrivacy(Message result) {
		}

		@Override
		public void separateConnection (int gsmIndex, Message result) {
		}

		@Override
		public void acceptCall (Message result) {
		}

		@Override
		public void rejectCall (Message result) {
		}

		@Override
		public void explicitCallTransfer (Message result) {
		}

		@Override
		public void getLastCallFailCause (Message result) {
		}

		@Deprecated
		@Override
		public void getLastPdpFailCause (Message result) {
		}

		@Override
		public void getLastDataCallFailCause (Message result) {
		}

		@Override
		public void setMute (boolean enableMute, Message response) {
		}

		@Override
		public void getMute (Message response) {
		}

		@Override
		public void getSignalStrength (Message result) {
		}

		@Override
		public void getVoiceRegistrationState (Message result) {
		}

		@Override
		public void getDataRegistrationState (Message result) {
		}

		@Override
		public void getOperator(Message result) {
		}

		@Override
		public void sendDtmf(char c, Message result) {
		}

		@Override
		public void startDtmf(char c, Message result) {
		}

		@Override
		public void stopDtmf(Message result) {
		}

		@Override
		public void sendBurstDtmf(String dtmfString, int on, int off,
		Message result) {
		}

		@Override
		public void sendSMS (String smscPDU, String pdu, Message result) {
		}

		@Override
		public void sendSMSExpectMore (String smscPDU, String pdu, Message result) {
		}

		@Override
		public void sendCdmaSms(byte[] pdu, Message result) {
		}

		@Override
		public void sendCdmaSMSExpectMore(byte[] pdu, Message result) {
		}

		@Override
		public void sendImsGsmSms (String smscPDU, String pdu,
		int retry, int messageRef, Message response) {
		}

		@Override
		public void sendImsCdmaSms(byte[] pdu, int retry, int messageRef,
		Message response) {
		}

		@Override
		public void getImsRegistrationState (Message result) {
		}

		@Override
		public void deleteSmsOnSim(int index, Message response) {
		}

		@Override
		public void deleteSmsOnRuim(int index, Message response) {
		}

		@Override
		public void writeSmsToSim(int status, String smsc, String pdu, Message response) {
		}

		@Override
		public void writeSmsToRuim(int status, byte[] pdu, Message response) {
		}

		@Override
		public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
		boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,
		NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,
		boolean matchAllRuleAllowed, Message result) {
		}

		@Override
		public void deactivateDataCall(int cid, int reason, Message result) {
		}

		@Override
		public void setRadioPower(boolean on, Message result) {
		}

		@Override
		public void setSuppServiceNotifications(boolean enable, Message result) {
		}

		@Override
		public void acknowledgeLastIncomingGsmSms(boolean success, int cause,
		Message result) {
		}

		@Override
		public void acknowledgeLastIncomingCdmaSms(boolean success, int cause,
		Message result) {
		}

		@Override
		public void acknowledgeIncomingGsmSmsWithPdu(boolean success, String ackPdu,
		Message result) {
		}

		@Override
		public void iccIO (int command, int fileid, String path, int p1, int p2,
		int p3, String data, String pin2, Message result) {
		}
		@Override
		public void iccIOForApp (int command, int fileid, String path, int p1, int p2,
		int p3, String data, String pin2, String aid, Message result) {
		}

		@Override
		public void getCLIR(Message result) {
		}

		@Override
		public void setCLIR(int clirMode, Message result) {
		}

		@Override
		public void queryCallWaiting(int serviceClass, Message response) {
		}

		@Override
		public void setCallWaiting(boolean enable, int serviceClass,
		Message response) {
		}

		@Override
		public void setNetworkSelectionModeAutomatic(Message response) {
		}

		@Override
		public void setNetworkSelectionModeManual(String operatorNumeric, int ran, Message response) {
		}

		@Override
		public void getNetworkSelectionMode(Message response) {
		}

		@Override
		public void getAvailableNetworks(Message response) {
		}

		@Override
		public void startNetworkScan(NetworkScanRequest nsr, Message response) {
		}

		@Override
		public void stopNetworkScan(Message response) {
		}

		@Override
		public void setCallForward(int action, int cfReason, int serviceClass,
		String number, int timeSeconds, Message response) {
		}

		@Override
		public void queryCallForwardStatus(int cfReason, int serviceClass,
		String number, Message response) {
		}

		@Override
		public void queryCLIP(Message response) {
		}

		@Override
		public void getBasebandVersion (Message response) {
		}

		@Override
		public void queryFacilityLock(String facility, String password,
		int serviceClass, Message response) {
		}

		@Override
		public void queryFacilityLockForApp(String facility, String password,
		int serviceClass, String appId, Message response) {
		}

		@Override
		public void setFacilityLock(String facility, boolean lockState,
		String password, int serviceClass, Message response) {
		}

		@Override
		public void setFacilityLockForApp(String facility, boolean lockState,
		String password, int serviceClass, String appId, Message response) {
		}

		@Override
		public void sendUSSD (String ussdString, Message response) {
		}

		@Override
		public void cancelPendingUssd (Message response) {
		}

		@Override
		public void resetRadio(Message result) {
		}

		@Override
		public void invokeOemRilRequestRaw(byte[] data, Message response) {
		}

		@Override
		public void invokeOemRilRequestStrings(String[] strings, Message response) {
		}

		@Override
		public void setBandMode (int bandMode, Message response) {
		}

		@Override
		public void queryAvailableBandMode (Message response) {
		}

		@Override
		public void sendTerminalResponse(String contents, Message response) {
		}

		@Override
		public void sendEnvelope(String contents, Message response) {
		}

		@Override
		public void sendEnvelopeWithStatus(String contents, Message response) {
		}

		@Override
		public void handleCallSetupRequestFromSim(
		boolean accept, Message response) {
		}

		@Override
		public void setPreferredNetworkType(int networkType , Message response) {
		}

		@Override
		public void getPreferredNetworkType(Message response) {
		}

		@Override
		public void setAllowedNetworkTypesBitmap(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message response) {
		}

		@Override
		public void getAllowedNetworkTypesBitmap(Message response) {
		}

		@Override
		public void setLocationUpdates(boolean enable, Message response) {
		}

		@Override
		public void getSmscAddress(Message result) {
		}

		@Override
		public void setSmscAddress(String address, Message result) {
		}

		@Override
		public void reportSmsMemoryStatus(boolean available, Message result) {
		}

		@Override
		public void reportStkServiceIsRunning(Message result) {
		}

		@Override
		public void getCdmaSubscriptionSource(Message response) {
		}

		@Override
		public void getGsmBroadcastConfig(Message response) {
		}

		@Override
		public void setGsmBroadcastConfig(SmsBroadcastConfigInfo[] config, Message response) {
		}

		@Override
		public void setGsmBroadcastActivation(boolean activate, Message response) {
		}

		// ***** Methods for CDMA support
		@Override
		public void getDeviceIdentity(Message response) {
		}

		@Override
		public void getCDMASubscription(Message response) {
		}

		@Override
		public void setPhoneType(int phoneType) { //Set by GsmCdmaPhone
		}

		@Override
		public void queryCdmaRoamingPreference(Message response) {
		}

		@Override
		public void setCdmaRoamingPreference(int cdmaRoamingType, Message response) {
		}

		@Override
		public void setCdmaSubscriptionSource(int cdmaSubscription , Message response) {
		}

		@Override
		public void queryTTYMode(Message response) {
		}

		@Override
		public void setTTYMode(int ttyMode, Message response) {
		}

		@Override
		public void sendCDMAFeatureCode(String FeatureCode, Message response) {
		}

		@Override
		public void getCdmaBroadcastConfig(Message response) {
		}

		@Override
		public void setCdmaBroadcastConfig(CdmaSmsBroadcastConfigInfo[] configs, Message response) {
		}

		@Override
		public void setCdmaBroadcastActivation(boolean activate, Message response) {
		}

		@Override
		public void exitEmergencyCallbackMode(Message response) {
		}

		@Override
		public void supplyIccPinForApp(String pin, String aid, Message response) {
		}

		@Override
		public void supplyIccPukForApp(String puk, String newPin, String aid, Message response) {
		}

		@Override
		public void supplyIccPin2ForApp(String pin2, String aid, Message response) {
		}

		@Override
		public void supplyIccPuk2ForApp(String puk2, String newPin2, String aid, Message response) {
		}

		@Override
		public void changeIccPinForApp(String oldPin, String newPin, String aidPtr, Message response) {
		}

		@Override
		public void changeIccPin2ForApp(String oldPin2, String newPin2, String aidPtr,
		Message response) {
		}

		@Override
		public void requestIccSimAuthentication(int authContext, String data, String aid, Message response) {
		}

		@Override
		public void getVoiceRadioTechnology(Message result) {
		}

		@Override
		public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming, Message result) {
		}

		@Override
		public void setDataProfile(DataProfile[] dps, boolean isRoaming, Message result) {
		}

		@Override
		public void iccOpenLogicalChannel(String AID, int p2, Message response) {
		}

		@Override
		public void iccCloseLogicalChannel(int channel, Message response) {
		}

		@Override
		public void iccTransmitApduLogicalChannel(int channel, int cla, int instruction,
		int p1, int p2, int p3, String data, Message response) {
		}

		@Override
		public void iccTransmitApduBasicChannel(int cla, int instruction, int p1, int p2,
		int p3, String data, Message response) {
		}

		@Override
		public void nvWriteCdmaPrl(byte[] preferredRoamingList, Message response) {
		}

		@Override
		public void nvResetConfig(int resetType, Message response) {
		}

		@Override
		public void getHardwareConfig(Message result) {
		}

		@Override
		public void requestShutdown(Message result) {
		}

		@Override
		public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
		}

		@Override
		public void stopLceService(Message result) {
		}

		@Override
		public void pullLceData(Message result) {
		}

		@Override
		public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo,
		Message result) {
		}

		@Override
		public void sendDeviceState(int stateType, boolean state, Message result) {
		}

		@Override
		public void setUnsolResponseFilter(int filter, Message result){
		}

		@Override
		public void setSignalStrengthReportingCriteria(
		SignalThresholdInfo signalThresholdInfo, int ran, Message result) {
		}

		@Override
		public void setLinkCapacityReportingCriteria(int hysteresisMs, int hysteresisDlKbps,
		int hysteresisUlKbps, int[] thresholdsDlKbps, int[] thresholdsUlKbps, int ran,
		Message result) {
		}

		@Override
		public void startNattKeepalive(
		int contextId, KeepalivePacketData packetData, int intervalMillis, Message result) {
		}

		@Override
		public void stopNattKeepalive(int sessionHandle, Message result) {
		}

		@Override
		public void allocatePduSessionId(Message result) {
		}

		@Override
		public void releasePduSessionId(Message result, int pduSessionId) {
		}

		@Override
		public void startHandover(Message result, int callId) {
		}

		@Override
		public void cancelHandover(Message result, int callId) {
		}
		}