Merge "Update Instrumentation code" (7f990b06) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/provider/Telephony.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ public final class Telephony {
		* @hide
		*/
		public static Cursor query(ContentResolver cr, String[] projection) {
		android.util.SeempLog.record(13);
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);
		}

		@@ -324,7 +324,7 @@ public final class Telephony {
		*/
		public static Cursor query(ContentResolver cr, String[] projection,
		String where, String orderBy) {
		android.util.SeempLog.record(13);
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, where,
		null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);
		}
		@@ -1954,7 +1954,7 @@ public final class Telephony {
		*/
		public static Cursor query(
		ContentResolver cr, String[] projection) {
		android.util.SeempLog.record(13);
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);
		}

		@@ -1965,7 +1965,7 @@ public final class Telephony {
		public static Cursor query(
		ContentResolver cr, String[] projection,
		String where, String orderBy) {
		android.util.SeempLog.record(13);
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection,
		where, null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);
		}

src/java/android/telephony/SmsManager.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@ public final class SmsManager {
		public void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record(94);
		android.util.SeempLog.record_str(75, destinationAddress);
		sendTextMessageInternal(destinationAddress, scAddress, text,
		sentIntent, deliveryIntent, true /* persistMessageForCarrierApp*/);
		}
		@@ -341,6 +341,7 @@ public final class SmsManager {
		public void sendTextMessageWithSelfPermissions(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record_str(75, destinationAddress);
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -525,7 +526,6 @@ public final class SmsManager {
		public void sendMultipartTextMessage(
		String destinationAddress, String scAddress, ArrayList<String> parts,
		ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents) {
		android.util.SeempLog.record(96);
		sendMultipartTextMessageInternal(destinationAddress, scAddress, parts,
		sentIntents, deliveryIntents, true /* persistMessageForCarrierApp*/);
		}
		@@ -709,7 +709,7 @@ public final class SmsManager {
		public void sendDataMessage(
		String destinationAddress, String scAddress, short destinationPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record(92);
		android.util.SeempLog.record_str(73, destinationAddress);
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -737,6 +737,7 @@ public final class SmsManager {
		public void sendDataMessageWithSelfPermissions(
		String destinationAddress, String scAddress, short destinationPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record_str(73, destinationAddress);
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -870,7 +871,7 @@ public final class SmsManager {
		* {@hide}
		*/
		public boolean copyMessageToIcc(byte[] smsc, byte[] pdu,int status) {
		android.util.SeempLog.record(98);
		android.util.SeempLog.record(79);
		boolean success = false;

		if (null == pdu) {
		@@ -902,7 +903,7 @@ public final class SmsManager {
		*/
		public boolean
		deleteMessageFromIcc(int messageIndex) {
		android.util.SeempLog.record(99);
		android.util.SeempLog.record(80);
		boolean success = false;
		byte[] pdu = new byte[IccConstants.SMS_RECORD_LENGTH-1];
		Arrays.fill(pdu, (byte)0xff);
		@@ -936,7 +937,7 @@ public final class SmsManager {
		* {@hide}
		*/
		public boolean updateMessageOnIcc(int messageIndex, int newStatus, byte[] pdu) {
		android.util.SeempLog.record(100);
		android.util.SeempLog.record(81);
		boolean success = false;

		try {

src/java/android/telephony/gsm/SmsManager.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ import java.util.ArrayList;
		public final void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record(94);
		android.util.SeempLog.record_str(75, destinationAddress);
		mSmsMgrProxy.sendTextMessage(destinationAddress, scAddress, text,
		sentIntent, deliveryIntent);
		}
		@@ -129,7 +129,7 @@ import java.util.ArrayList;
		public final void sendMultipartTextMessage(
		String destinationAddress, String scAddress, ArrayList<String> parts,
		ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents) {
		android.util.SeempLog.record(96);
		android.util.SeempLog.record_str(77, destinationAddress);
		mSmsMgrProxy.sendMultipartTextMessage(destinationAddress, scAddress, parts,
		sentIntents, deliveryIntents);
		}
		@@ -163,7 +163,7 @@ import java.util.ArrayList;
		public final void sendDataMessage(
		String destinationAddress, String scAddress, short destinationPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		android.util.SeempLog.record(92);
		android.util.SeempLog.record_str(73, destinationAddress);
		mSmsMgrProxy.sendDataMessage(destinationAddress, scAddress, destinationPort,
		data, sentIntent, deliveryIntent);
		}
		@@ -181,7 +181,7 @@ import java.util.ArrayList;
		*/
		@Deprecated
		public final boolean copyMessageToSim(byte[] smsc, byte[] pdu, int status) {
		android.util.SeempLog.record(101);
		android.util.SeempLog.record(82);
		return mSmsMgrProxy.copyMessageToIcc(smsc, pdu, status);
		}

		@@ -195,7 +195,7 @@ import java.util.ArrayList;
		*/
		@Deprecated
		public final boolean deleteMessageFromSim(int messageIndex) {
		android.util.SeempLog.record(102);
		android.util.SeempLog.record(83);
		return mSmsMgrProxy.deleteMessageFromIcc(messageIndex);
		}

		@@ -213,7 +213,7 @@ import java.util.ArrayList;
		*/
		@Deprecated
		public final boolean updateMessageOnSim(int messageIndex, int newStatus, byte[] pdu) {
		android.util.SeempLog.record(103);
		android.util.SeempLog.record(84);
		return mSmsMgrProxy.updateMessageOnIcc(messageIndex, newStatus, pdu);
		}

		@@ -225,7 +225,7 @@ import java.util.ArrayList;
		*/
		@Deprecated
		public final ArrayList<android.telephony.SmsMessage> getAllMessagesFromSim() {
		android.util.SeempLog.record(104);
		android.util.SeempLog.record(85);
		return android.telephony.SmsManager.getDefault().getAllMessagesFromIcc();
		}