Merge change 2736 into donut (c3b7e4e7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2838,12 +2838,12 @@ public final class Settings {
		* out without asking for use permit, to limit the un-authorized SMS
		* usage.
		*/
		public static final String SMS_OUTGOING_CEHCK_INTERVAL_MS =
		public static final String SMS_OUTGOING_CHECK_INTERVAL_MS =
		"sms_outgoing_check_interval_ms";

		/**
		* The number of outgoing SMS sent without asking for user permit
		* (of {@link #SMS_OUTGOING_CEHCK_INTERVAL_MS}
		* (of {@link #SMS_OUTGOING_CHECK_INTERVAL_MS}
		*/
		public static final String SMS_OUTGOING_CEHCK_MAX_COUNT =
		"sms_outgoing_check_max_count";

core/java/android/provider/Telephony.java

+29 −2

Original line number	Diff line number	Diff line
		@@ -465,6 +465,24 @@ public final class Telephony {
		* Contains info about SMS related Intents that are broadcast.
		*/
		public static final class Intents {
		/**
		* Set by BroadcastReceiver. Indicates the message was handled
		* successfully.
		*/
		public static final int RESULT_SMS_HANDLED = 1;

		/**
		* Set by BroadcastReceiver. Indicates a generic error while
		* processing the message.
		*/
		public static final int RESULT_SMS_GENERIC_ERROR = 2;

		/**
		* Set by BroadcastReceiver. Indicates insufficient memory to store
		* the message.
		*/
		public static final int RESULT_SMS_OUT_OF_MEMORY = 3;

		/**
		* Broadcast Action: A new text based SMS message has been received
		* by the device. The intent will have the following extra
		@@ -476,7 +494,10 @@ public final class Telephony {
		* </ul>
		*
		* <p>The extra values can be extracted using
		* {@link #getMessagesFromIntent(Intent)}</p>
		* {@link #getMessagesFromIntent(Intent)}.</p>
		*
		* <p>If a BroadcastReceiver encounters an error while processing
		* this intent it should set the result code appropriately.</p>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String SMS_RECEIVED_ACTION =
		@@ -493,7 +514,10 @@ public final class Telephony {
		* </ul>
		*
		* <p>The extra values can be extracted using
		* {@link #getMessagesFromIntent(Intent)}</p>
		* {@link #getMessagesFromIntent(Intent)}.</p>
		*
		* <p>If a BroadcastReceiver encounters an error while processing
		* this intent it should set the result code appropriately.</p>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String DATA_SMS_RECEIVED_ACTION =
		@@ -510,6 +534,9 @@ public final class Telephony {
		* <li><em>pduType (Integer)</em> - The WAP PDU type</li>
		* <li><em>data</em> - The data payload of the message</li>
		* </ul>
		*
		* <p>If a BroadcastReceiver encounters an error while processing
		* this intent it should set the result code appropriately.</p>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String WAP_PUSH_RECEIVED_ACTION =

telephony/java/com/android/internal/telephony/CommandsInterface.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -147,6 +147,14 @@ public interface CommandsInterface {
		static final int SIM_REFRESH_INIT = 1; // SIM initialized; reload all
		static final int SIM_REFRESH_RESET = 2; // SIM reset; may be locked

		// GSM SMS fail cause for acknowledgeLastIncomingSMS. From TS 23.040, 9.2.3.22.
		static final int GSM_SMS_FAIL_CAUSE_MEMORY_CAPACITY_EXCEEDED = 0xD3;
		static final int GSM_SMS_FAIL_CAUSE_UNSPECIFIED_ERROR = 0xFF;

		// CDMA SMS fail cause for acknowledgeLastIncomingCdmaSms. From TS N.S00005, 6.5.2.125.
		static final int CDMA_SMS_FAIL_CAUSE_RESOURCE_SHORTAGE = 35;
		static final int CDMA_SMS_FAIL_CAUSE_OTHER_TERMINAL_PROBLEM = 39;

		//***** Methods

		RadioState getRadioState();
		@@ -882,9 +890,9 @@ public interface CommandsInterface {

		void setRadioPower(boolean on, Message response);

		void acknowledgeLastIncomingSMS(boolean success, Message response);
		void acknowledgeLastIncomingGsmSms(boolean success, int cause, Message response);

		void acknowledgeLastIncomingCdmaSms(boolean success, Message response);
		void acknowledgeLastIncomingCdmaSms(boolean success, int cause, Message response);

		/**
		* parameters equivilient to 27.007 AT+CRSM command
		@@ -1087,6 +1095,12 @@ public interface CommandsInterface {
		*/
		void setSmscAddress(String address, Message result);

		/**
		* Indicates whether there is storage available for new SMS messages.
		* @param available true if storage is available
		* @param result callback message
		*/
		void reportSmsMemoryStatus(boolean available, Message result);

		void invokeOemRilRequestRaw(byte[] data, Message response);

telephony/java/com/android/internal/telephony/RIL.java

+24 −6

Original line number	Diff line number	Diff line
		@@ -1339,28 +1339,32 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		}

		public void
		acknowledgeLastIncomingSMS(boolean success, Message result) {
		acknowledgeLastIncomingGsmSms(boolean success, int cause, Message result) {
		RILRequest rr
		= RILRequest.obtain(RIL_REQUEST_SMS_ACKNOWLEDGE, result);

		rr.mp.writeInt(1);
		rr.mp.writeInt(2);
		rr.mp.writeInt(success ? 1 : 0);
		rr.mp.writeInt(cause);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " " + success + " " + cause);

		send(rr);
		}

		public void
		acknowledgeLastIncomingCdmaSms(boolean success, Message result) {
		acknowledgeLastIncomingCdmaSms(boolean success, int cause, Message result) {
		RILRequest rr
		= RILRequest.obtain(RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, result);

		rr.mp.writeInt(2);
		rr.mp.writeInt(success ? 0 : 1); //RIL_CDMA_SMS_ErrorClass
		// cause code according to X.S004-550E
		rr.mp.writeInt(39); //39 means other terminal problem; is not interpreted for success.
		rr.mp.writeInt(cause);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " " + success + " " + cause);

		send(rr);
		}
		@@ -1812,6 +1816,20 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		send(rr);
		}

		/**
		* {@inheritDoc}
		*/
		public void reportSmsMemoryStatus(boolean available, Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, result);
		rr.mp.writeInt(1);
		rr.mp.writeInt(available ? 1 : 0);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> "
		+ requestToString(rr.mRequest) + ": " + available);

		send(rr);
		}

		//***** Private Methods

		private void sendScreenState(boolean on) {

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,7 @@ cat include/telephony/ril.h \| \
		int RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE = 99;
		int RIL_REQUEST_GET_SMSC_ADDRESS = 100;
		int RIL_REQUEST_SET_SMSC_ADDRESS = 101;
		int RIL_REQUEST_REPORT_SMS_MEMORY_STATUS = 102;
		int RIL_UNSOL_RESPONSE_BASE = 1000;
		int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
		int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001;