Merge "Merge "Merge "Initialize CallModifyRequest to null""" (4610dc3d) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/MSimSmsManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -152,8 +152,9 @@ public class MSimSmsManager {
		try {
		ISmsMSim iccISms = ISmsMSim.Stub.asInterface(ServiceManager.getService("isms_msim"));
		if (iccISms != null) {
		iccISms.sendTextWithPriority(destinationAddress, scAddress, text, sentIntent,
		deliveryIntent, subscription, priority);
		iccISms.sendTextWithPriority(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent, subscription,
		priority);
		}
		} catch (RemoteException ex) {
		// ignore it

src/java/android/telephony/SmsManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -141,8 +141,8 @@ public final class SmsManager {
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendTextWithPriority(destinationAddress, scAddress, text, sentIntent,
		deliveryIntent, priority);
		iccISms.sendTextWithPriority(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent, priority);
		}
		} catch (RemoteException ex) {
		// ignore it

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public abstract class Call {
		}
		}

		public boolean isMpty = false;
		private String[] mConfUriList;

		/* Instance Variables */

		@@ -146,6 +148,14 @@ public abstract class Call {
		return earliest;
		}

		public String[] getConfUriList() {
		return mConfUriList;
		}

		public void setConfUriList(String[] urilist) {
		mConfUriList = urilist;
		}

		public long
		getEarliestCreateTime() {
		List<Connection> l;

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

0 → 100644

+260 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are
		* met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES O
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		package com.android.internal.telephony;

		import java.util.Map;
		import java.util.Map.Entry;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* CallDetails class takes care of all the additional details like call type and
		* domain needed for IMS calls. This class is not relevant for non-IMS calls
		*/
		public class CallDetails {

		/*
		* Type of the call based on the media type and the direction of the media.
		*/

		public static final int CALL_TYPE_VOICE = 0; /*
		* Phone.CALL_TYPE_VOICE /*
		* Voice call-audio in both
		* directions
		*/

		public static final int CALL_TYPE_VT_TX = 1; /*
		* Phone.CALL_TYPE_VT_TX; PS
		* Video telephony call: one
		* way TX video, two way audio
		*/

		public static final int CALL_TYPE_VT_RX = 2; /*
		* Phone.CALL_TYPE_VT_RX Video
		* telephony call: one way RX
		* video, two way audio
		*/

		public static final int CALL_TYPE_VT = 3; /*
		* Phone.CALL_TYPE_VT; Video
		* telephony call: two way video,
		* two way audio
		*/

		public static final int CALL_TYPE_VT_NODIR = 4; /*
		* Phone.CALL_TYPE_VT_NODIR;
		* Video telephony call: no
		* direction, two way audio,
		* intermediate state in a
		* video call till video
		* link is setup
		*/

		public static final int CALL_TYPE_SMS = 5; /*
		* Phone.CALL_TYPE_SMS;SMS Type
		*/

		public static final int CALL_TYPE_UNKNOWN = 10; /*
		* Phone.CALL_TYPE_UNKNOWN;
		* Unknown Call type, may be
		* used for answering call
		* with same call type as
		* incoming call. This is
		* only for telephony, not
		* meant to be passed to RIL
		*/

		public static final int CALL_DOMAIN_UNKNOWN = 11; /*
		* Phone.CALL_DOMAIN_UNKNOWN
		* ; Unknown domain. Sent
		* by RIL when modem has
		* not yet selected a
		* domain for a call
		*/
		public static final int CALL_DOMAIN_CS = 1; /*
		* Phone.CALL_DOMAIN_CS; Circuit
		* switched domain
		*/
		public static final int CALL_DOMAIN_PS = 2; /*
		* Phone.CALL_DOMAIN_PS; Packet
		* switched domain
		*/
		public static final int CALL_DOMAIN_AUTOMATIC = 3; /*
		* Phone.
		* CALL_DOMAIN_AUTOMATIC;
		* Automatic domain. Sent
		* by Android to indicate
		* that the domain for a
		* new call should be
		* selected by modem
		*/
		public static final int CALL_DOMAIN_NOT_SET = 4; /*
		* Phone.CALL_DOMAIN_NOT_SET
		* ; Init value used
		* internally by telephony
		* until domain is set
		*/

		public static final int CALL_RESTRICT_CAUSE_NONE = 0; /*
		* Default cause, not
		* restricted
		*/
		public static final int CALL_RESTRICT_CAUSE_RAT = 1; /*
		* Service not
		* supported by RAT
		*/
		public static final int CALL_RESTRICT_CAUSE_DISABLED = 2; /*
		* Service
		* disabled
		*/

		public static final String EXTRAS_IS_CONFERENCE_URI = "isConferenceUri";
		public static final String EXTRAS_PARENT_CALL_ID = "parentCallId";

		public int call_type;
		public int call_domain;
		public String[] extras;

		public static class ServiceStatus {
		public boolean isValid;
		public int type;
		public int status;
		public byte[] userdata;
		public int restrictCause;

		public ServiceStatus() {
		this.isValid = false;
		}
		}

		public ServiceStatus[] localAbility;
		public ServiceStatus[] peerAbility;

		public CallDetails() {
		call_type = CALL_TYPE_UNKNOWN;
		call_domain = CALL_DOMAIN_NOT_SET;
		extras = null;
		}

		public CallDetails(int callType, int callDomain, String[] extraparams) {
		call_type = callType;
		call_domain = callDomain;
		extras = extraparams;
		}

		public CallDetails(CallDetails srcCall) {
		if (srcCall != null) {
		call_type = srcCall.call_type;
		call_domain = srcCall.call_domain;
		extras = srcCall.extras;
		localAbility = srcCall.localAbility;
		peerAbility = srcCall.peerAbility;
		}
		}

		public void setExtras(String[] extraparams) {
		extras = extraparams;
		}

		public static String[] getExtrasFromMap(Map<String, String> newExtras) {
		String[] extras = null;

		if (newExtras == null) {
		return null;
		}

		// TODO: Merge new extras into extras. For now, just serialize and set
		// them
		extras = new String[newExtras.size()];

		if (extras != null) {
		int i = 0;
		for (Entry<String, String> entry : newExtras.entrySet()) {
		extras[i] = "" + entry.getKey() + "=" + entry.getValue();
		}
		}
		return extras;
		}

		public void setExtrasFromMap(Map<String, String> newExtras) {
		this.extras = getExtrasFromMap(newExtras);
		}

		public String getValueForKeyFromExtras(String[] extras, String key) {
		for (int i = 0; extras != null && i < extras.length; i++) {
		if (extras[i] != null) {
		String[] currKey = extras[i].split("=");
		if (currKey.length == 2 && currKey[0].equals(key)) {
		return currKey[1];
		}
		}
		}
		return null;
		}

		/**
		* @return string representation.
		*/
		@Override
		public String toString() {
		String extrasResult = "", localSrvAbility = "", peerSrvAbility = "";
		if (extras != null) {
		for (String s : extras) {
		extrasResult += s;
		}
		}

		if (localAbility != null) {
		for (ServiceStatus srv : localAbility) {
		if (srv != null) {
		localSrvAbility += "isValid = " + srv.isValid + " type = "
		+ srv.type + " status = " + srv.status + " restrictCause = "
		+ srv.restrictCause;
		}
		}
		}

		if (peerAbility != null) {
		for (ServiceStatus srv : peerAbility) {
		if (srv != null) {
		peerSrvAbility += "isValid = " + srv.isValid + " type = "
		+ srv.type + " status = " + srv.status + " restrictCause = "
		+ srv.restrictCause;
		}
		}
		}

		return (" " + call_type
		+ " " + call_domain
		+ " " + extrasResult
		+ " Local Ability " + localSrvAbility
		+ " Peer Ability " + peerSrvAbility);
		}
		}

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

+42 −5

Original line number	Diff line number	Diff line
		@@ -30,8 +30,9 @@ import android.os.Registrant;
		import android.os.SystemProperties;
		import android.telephony.MSimTelephonyManager;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;

		import java.util.ArrayList;
		import java.util.Collections;
		@@ -83,6 +84,7 @@ public class CallManager {
		private static final int EVENT_SERVICE_STATE_CHANGED = 118;
		private static final int EVENT_POST_DIAL_CHARACTER = 119;
		private static final int EVENT_SUPP_SERVICE_NOTIFY = 120;
		private static final int EVENT_CALL_MODIFY = 121;

		private static final String PROPERTY_QCHAT_ENABLED = "persist.atel.qchat_enabled";

		@@ -178,6 +180,9 @@ public class CallManager {
		protected final RegistrantList mPostDialCharacterRegistrants
		= new RegistrantList();

		protected final RegistrantList mCallModifyRegistrants
		= new RegistrantList();

		protected CallManager() {
		mPhones = new ArrayList<Phone>();
		mRingingCalls = new ArrayList<Call>();
		@@ -434,6 +439,12 @@ public class CallManager {
		return phone;
		}

		private boolean isImsOnWifi(Phone offHookPhone) {
		return (offHookPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS &&
		offHookPhone.getServiceState().getDataNetworkType() !=
		TelephonyManager.NETWORK_TYPE_LTE);
		}

		public void setAudioMode() {
		Context context = getContext();
		if (context == null) return;
		@@ -470,9 +481,11 @@ public class CallManager {
		}

		int newAudioMode = AudioManager.MODE_IN_CALL;
		if (offhookPhone instanceof SipPhone) {
		if (offhookPhone instanceof SipPhone \|\| isImsOnWifi(offhookPhone)) {
		Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP call!");
		// enable IN_COMMUNICATION audio mode instead for sipPhone
		// or for IMS calls over wifi
		Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP or wifi call!");
		newAudioMode = AudioManager.MODE_IN_COMMUNICATION;
		}
		int currMode = audioManager.getMode();
		@@ -543,6 +556,11 @@ public class CallManager {

		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
		phone.registerForEcmTimerReset(mHandler, EVENT_ECM_TIMER_RESET, null);
		try {
		phone.registerForModifyCallRequest(mHandler, EVENT_CALL_MODIFY, null);
		} catch (CallStateException e) {
		Rlog.e(LOG_TAG, "registerForModifyCallRequest: CallStateException:" + e);
		}
		}
		}

		@@ -620,7 +638,6 @@ public class CallManager {
		*/
		public void acceptCall(Call ringingCall, int callType) throws CallStateException {
		Phone ringingPhone = ringingCall.getPhone();

		if (VDBG) {
		Rlog.d(LOG_TAG, "acceptCall api with calltype " + callType);
		Rlog.d(LOG_TAG, "acceptCall(" + ringingCall + " from " + ringingCall.getPhone() + ")");
		@@ -669,7 +686,6 @@ public class CallManager {
		}

		if (VDBG) {
		Rlog.d(LOG_TAG, "Call type in acceptCall " + callType);
		Rlog.d(LOG_TAG, "End acceptCall(" +ringingCall + ")");
		Rlog.d(LOG_TAG, toString());
		}
		@@ -1648,6 +1664,17 @@ public class CallManager {
		mPostDialCharacterRegistrants.remove(h);
		}

		/*
		* Registrants for CallModify
		*/
		public void registerForCallModify(Handler h, int what, Object obj) {
		mCallModifyRegistrants.addUnique(h, what, obj);
		}

		public void unregisterForCallModify(Handler h) {
		mCallModifyRegistrants.remove(h);
		}

		/* APIs to access foregroudCalls, backgroudCalls, and ringingCalls
		* 1. APIs to access list of calls
		* 2. APIs to check if any active call, which has connection other than
		@@ -1995,6 +2022,16 @@ public class CallManager {
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SERVICE_STATE_CHANGED)");
		mServiceStateChangedRegistrants.notifyRegistrants((AsyncResult) msg.obj);
		break;
		case EVENT_CALL_MODIFY:
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_CALL_MODIFY)");
		AsyncResult ar = (AsyncResult) msg.obj;
		if (ar != null && ar.result != null && ar.exception == null) {
		mCallModifyRegistrants.notifyRegistrants(new AsyncResult(null,
		(Connection) ar.result, null));
		} else {
		Rlog.e(LOG_TAG, "Error EVENT_MODIFY_CALL AsyncResult ar= " + ar);
		}
		break;
		case EVENT_POST_DIAL_CHARACTER:
		// we need send the character that is being processed in msg.arg1
		// so can't use notifyRegistrants()