Merge f5fa09ffe06d6451bd1c18d0c1ab80282d16bfcf on remote branch (5028f4ed) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/MSimSmsManager.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ public class MSimSmsManager {
		* raw pdu of the status report is in the extended data ("pdu").
		* @param priority Priority level of the message
		* @param subscription on which the SMS has to be sent.
		* @param validityPeriod Validity Period of the message in Minutes.
		*
		* @throws IllegalArgumentException if destinationAddress or text are empty
		*
		@@ -136,7 +137,7 @@ public class MSimSmsManager {
		public void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority,
		boolean isExpectMore, int subscription) {
		boolean isExpectMore, int validityPeriod, int subscription) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -150,7 +151,7 @@ public class MSimSmsManager {
		if (iccISms != null) {
		iccISms.sendTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent,
		priority, isExpectMore, subscription);
		priority, isExpectMore, validityPeriod, subscription);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -274,13 +275,14 @@ public class MSimSmsManager {
		* extended data ("pdu").
		* @param priority Priority level of the message
		* @param subscription on which the SMS has to be sent.
		* @param validityPeriod Validity Period of the message in Minutes.
		*
		* @throws IllegalArgumentException if destinationAddress or data are empty
		*/
		public void sendMultipartTextMessage(String destinationAddress, String scAddress,
		ArrayList<String> parts, ArrayList<PendingIntent> sentIntents,
		ArrayList<PendingIntent> deliveryIntents, int priority, boolean isExpectMore,
		int subscription) {
		int validityPeriod, int subscription) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -295,7 +297,7 @@ public class MSimSmsManager {
		if (iccISms != null) {
		iccISms.sendMultipartTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, parts, sentIntents, deliveryIntents,
		priority, isExpectMore, subscription);
		priority, isExpectMore, validityPeriod, subscription);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -310,7 +312,8 @@ public class MSimSmsManager {
		deliveryIntent = deliveryIntents.get(0);
		}
		sendTextMessage(destinationAddress, scAddress, parts.get(0),
		sentIntent, deliveryIntent, priority, isExpectMore, subscription);
		sentIntent, deliveryIntent, priority, isExpectMore, validityPeriod,
		subscription);
		}
		}

src/java/android/telephony/SmsManager.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ public final class SmsManager {
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		* @param priority Priority level of the message
		* @param validityPeriod Validity Period of the message in Minutes.
		*
		* @throws IllegalArgumentException if destinationAddress or text are empty
		* {@hide}
		@@ -149,7 +150,7 @@ public final class SmsManager {
		public void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority,
		boolean isExpectMore) {
		boolean isExpectMore, int validityPeriod) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -163,7 +164,7 @@ public final class SmsManager {
		if (iccISms != null) {
		iccISms.sendTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent,
		priority, isExpectMore);
		priority, isExpectMore, validityPeriod);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -302,6 +303,7 @@ public final class SmsManager {
		* to the recipient. The raw pdu of the status report is in the
		* extended data ("pdu").
		* @param priority Priority level of the message
		* @param validityPeriod Validity Period of the message in Minutes.
		*
		* @throws IllegalArgumentException if destinationAddress or data are empty
		* {@hide}
		@@ -309,7 +311,7 @@ public final class SmsManager {
		public void sendMultipartTextMessage(
		String destinationAddress, String scAddress, ArrayList<String> parts,
		ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents,
		int priority, boolean isExpectMore) {
		int priority, boolean isExpectMore, int validityPeriod) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -323,7 +325,8 @@ public final class SmsManager {
		if (iccISms != null) {
		iccISms.sendMultipartTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, parts,
		sentIntents, deliveryIntents, priority, isExpectMore);
		sentIntents, deliveryIntents, priority, isExpectMore,
		validityPeriod);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -338,7 +341,7 @@ public final class SmsManager {
		deliveryIntent = deliveryIntents.get(0);
		}
		sendTextMessage(destinationAddress, scAddress, parts.get(0),
		sentIntent, deliveryIntent, priority, isExpectMore);
		sentIntent, deliveryIntent, priority, isExpectMore, validityPeriod);
		}
		}

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,16 @@ public class CallDetails {
		* disabled
		*/

		public static final int VIDEO_PAUSE_STATE_PAUSED = 1; /*
		* Indicates that
		* video is paused;
		*/

		public static final int VIDEO_PAUSE_STATE_RESUMED = 2; /*
		* Indicates that
		* video is resumed;
		*/

		public static final String EXTRAS_IS_CONFERENCE_URI = "isConferenceUri";
		public static final String EXTRAS_PARENT_CALL_ID = "parentCallId";
		public static final String EXTRAS_HANDOVER_INFORMATION = "handoverInfo";
		@@ -159,6 +169,7 @@ public class CallDetails {
		public int call_type;
		public int call_domain;
		public String[] extras;
		private int mVideoPauseState = VIDEO_PAUSE_STATE_RESUMED;

		public static class ServiceStatus {
		public boolean isValid;
		@@ -225,6 +236,19 @@ public class CallDetails {
		this.extras = getExtrasFromMap(newExtras);
		}

		public void setVideoPauseState(int videoPauseState) {
		// Validate and set the new video pause state.
		switch (videoPauseState) {
		case VIDEO_PAUSE_STATE_RESUMED:
		case VIDEO_PAUSE_STATE_PAUSED:
		mVideoPauseState = videoPauseState;
		}
		}

		public int getVideoPauseState() {
		return mVideoPauseState;
		}

		public String getValueForKeyFromExtras(String[] extras, String key) {
		for (int i = 0; extras != null && i < extras.length; i++) {
		if (extras[i] != null) {
		@@ -272,6 +296,7 @@ public class CallDetails {
		return (" " + call_type
		+ " " + call_domain
		+ " " + extrasResult
		+ " videoPauseState" + mVideoPauseState
		+ " Local Ability " + localSrvAbility
		+ " Peer Ability " + peerSrvAbility);
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,9 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
		}
		mIs3gCard = false;
		mCurrentApp = null;
		if (mRecords != null) {
		mRecords.clear();
		}
		}

		public void dispose() {

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

+11 −7

Original line number	Diff line number	Diff line
		@@ -397,7 +397,7 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		return;
		}
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent, -1, false);
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent, -1, false, -1);
		}

		/**
		@@ -424,25 +424,27 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		* @param priority Priority level of the message
		* @param validityPeriod Validity Period of the message in Minutes.
		*/
		@Override
		public void sendTextWithOptions(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent,
		int priority, boolean isExpectMore) {
		int priority, boolean isExpectMore, int validityPeriod) {
		mPhone.getContext().enforceCallingPermission(
		Manifest.permission.SEND_SMS,
		"Sending SMS message");
		if (Rlog.isLoggable("SMS", Log.VERBOSE)) {
		log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr +
		" text='"+ text + "' sentIntent=" +
		sentIntent + " deliveryIntent=" + deliveryIntent);
		sentIntent + " deliveryIntent=" + deliveryIntent +
		"validityPeriod" + validityPeriod);
		}
		if (mAppOps.noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(),
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		return;
		}
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent, priority,
		isExpectMore);
		isExpectMore, validityPeriod);
		}

		/**
		@@ -490,7 +492,7 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		}
		mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents,
		-1, false);
		-1, false, -1);
		}

		/**
		@@ -518,11 +520,13 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		* to the recipient. The raw pdu of the status report is in the
		* extended data ("pdu").
		* @param priority Priority level of the message
		* @param validityPeriod Validity Period of the message in Minutes.
		*/
		@Override
		public void sendMultipartTextWithOptions(String callingPackage, String destAddr,
		String scAddr, List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents, int priority, boolean isExpectMore) {
		List<PendingIntent> deliveryIntents, int priority, boolean isExpectMore,
		int validityPeriod) {
		mPhone.getContext().enforceCallingPermission(
		Manifest.permission.SEND_SMS,
		"Sending SMS message");
		@@ -539,7 +543,7 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		}
		mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents,
		priority, isExpectMore);
		priority, isExpectMore, validityPeriod);
		}

		@Override