am 1e6dab1: Merge change 1406 into donut (e171cd63) · Commits · e / os / android_frameworks_base

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -1023,6 +1023,21 @@ public interface CommandsInterface {
		*/
		void setLocationUpdates(boolean enable, Message response);

		/**
		* Gets the default SMSC address.
		*
		* @param result Callback message contains the SMSC address.
		*/
		void getSmscAddress(Message result);

		/**
		* Sets the default SMSC address.
		*
		* @param address new SMSC address
		* @param result Callback message is empty on completion
		*/
		void setSmscAddress(String address, Message result);


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

telephony/java/com/android/internal/telephony/Phone.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -924,6 +924,21 @@ public interface Phone {
		*/
		void getPreferredNetworkType(Message response);

		/**
		* Gets the default SMSC address.
		*
		* @param result Callback message contains the SMSC address.
		*/
		void getSmscAddress(Message result);

		/**
		* Sets the default SMSC address.
		*
		* @param address new SMSC address
		* @param result Callback message is empty on completion
		*/
		void setSmscAddress(String address, Message result);

		/**
		* Query neighboring cell IDs. <code>response</code> is dispatched when
		* this is complete. <code>response.obj</code> will be an AsyncResult,

telephony/java/com/android/internal/telephony/PhoneBase.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -574,6 +574,14 @@ public abstract class PhoneBase implements Phone {
		mCM.getPreferredNetworkType(response);
		}

		public void getSmscAddress(Message result) {
		mCM.getSmscAddress(result);
		}

		public void setSmscAddress(String address, Message result) {
		mCM.setSmscAddress(address, result);
		}

		public void setTTYModeEnabled(boolean enable, Message onComplete) {
		// This function should be overridden by the class CDMAPhone. Not implemented in GSMPhone.
		Log.e(LOG_TAG, "Error! This function should never be executed, inactive CDMAPhone.");

telephony/java/com/android/internal/telephony/PhoneProxy.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -671,5 +671,13 @@ public class PhoneProxy extends Handler implements Phone {
		public void notifyDataActivity() {
		mActivePhone.notifyDataActivity();
		}

		public void getSmscAddress(Message result) {
		mActivePhone.getSmscAddress(result);
		}

		public void setSmscAddress(String address, Message result) {
		mActivePhone.setSmscAddress(address, result);
		}
		}

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

+30 −0

Original line number	Diff line number	Diff line
		@@ -1760,6 +1760,32 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		send(rr);
		}

		/**
		* {@inheritDoc}
		*/
		public void getSmscAddress(Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_SMSC_ADDRESS, result);

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

		send(rr);
		}

		/**
		* {@inheritDoc}
		*/
		public void setSmscAddress(String address, Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_SET_SMSC_ADDRESS, result);

		rr.mp.writeInt(1);
		rr.mp.writeString(address);

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

		send(rr);
		}

		//***** Private Methods

		private void sendScreenState(boolean on) {
		@@ -2027,6 +2053,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret = responseInts(p); break;
		case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret = responseVoid(p); break;
		case RIL_REQUEST_DEVICE_IDENTITY: ret = responseStrings(p); break;
		case RIL_REQUEST_GET_SMSC_ADDRESS: ret = responseString(p); break;
		case RIL_REQUEST_SET_SMSC_ADDRESS: ret = responseVoid(p); break;
		default:
		throw new RuntimeException("Unrecognized solicited response: " + rr.mRequest);
		//break;
		@@ -2885,6 +2913,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: return "RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM";
		case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: return "RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM";
		case RIL_REQUEST_DEVICE_IDENTITY: return "RIL_REQUEST_DEVICE_IDENTITY";
		case RIL_REQUEST_GET_SMSC_ADDRESS: return "RIL_REQUEST_GET_SMSC_ADDRESS";
		case RIL_REQUEST_SET_SMSC_ADDRESS: return "RIL_REQUEST_SET_SMSC_ADDRESS";
		default: return "<unknown request>";
		}
		}