Update all CM radio code for the current API (d7e84dd5) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -479,10 +479,10 @@ public final class CallManager {
		}

		if (audioManager.getMode() == AudioManager.MODE_IN_CALL) {
		Log.d(LOG_TAG, "setAudioMode(): " + aPValues[0] + "=" + aPValues[1]);
		Rlog.d(LOG_TAG, "setAudioMode(): " + aPValues[0] + "=" + aPValues[1]);
		audioManager.setParameters(aPValues[0] + "=" + aPValues[1]);
		} else if (audioManager.getMode() == AudioManager.MODE_NORMAL) {
		Log.d(LOG_TAG, "setAudioMode(): " + aPValues[0] + "=" + aPValues[2]);
		Rlog.d(LOG_TAG, "setAudioMode(): " + aPValues[0] + "=" + aPValues[2]);
		audioManager.setParameters(aPValues[0] + "=" + aPValues[2]);
		}
		}
		@@ -499,7 +499,7 @@ public final class CallManager {
		// other sound sources
		: AudioManager.AUDIOFOCUS_GAIN_TRANSIENT;

		if (VDBG) Log.d(LOG_TAG, "requestAudioFocus on STREAM_RING");
		if (VDBG) Rlog.d(LOG_TAG, "requestAudioFocus on STREAM_RING");
		audioManager.requestAudioFocusForCall(AudioManager.STREAM_RING, hint);
		}

		@@ -1931,7 +1931,7 @@ public final class CallManager {
		mSuppServiceFailedRegistrants.notifyRegistrants((AsyncResult) msg.obj);
		break;
		case EVENT_SUPP_SERVICE_NOTIFY:
		if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_NOTIFICATION)");
		if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_NOTIFICATION)");
		mSuppServiceNotificationRegistrants.notifyRegistrants((AsyncResult) msg.obj);
		break;
		case EVENT_SERVICE_STATE_CHANGED:

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ import android.os.Parcel;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.telephony.IccCardApplicationStatus;
		import com.android.internal.telephony.IccCardStatus;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus;
		import com.android.internal.telephony.uicc.IccCardStatus;

		import java.util.ArrayList;

src/java/com/android/internal/telephony/ISms.aidl

deleted100644 → 0

+0 −216

Original line number	Diff line number	Diff line
		/*
		** Copyright 2007, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		package com.android.internal.telephony;

		import android.app.PendingIntent;
		import com.android.internal.telephony.SmsRawData;

		import java.util.List;

		/** Interface for applications to access the ICC phone book.
		*
		* <p>The following code snippet demonstrates a static method to
		* retrieve the ISms interface from Android:</p>
		* <pre>private static ISms getSmsInterface()
		throws DeadObjectException {
		IServiceManager sm = ServiceManagerNative.getDefault();
		ISms ss;
		ss = ISms.Stub.asInterface(sm.getService("isms"));
		return ss;
		}
		* </pre>
		*/

		interface ISms {
		void synthesizeMessages(String originatingAddress, String scAddress, in List<String> messages, long timestampMillis);

		/**
		* Retrieves all messages currently stored on ICC.
		*
		* @return list of SmsRawData of all sms on ICC
		*/
		List<SmsRawData> getAllMessagesFromIccEf();

		/**
		* Update the specified message on the ICC.
		*
		* @param messageIndex record index of message to update
		* @param newStatus new message status (STATUS_ON_ICC_READ,
		* STATUS_ON_ICC_UNREAD, STATUS_ON_ICC_SENT,
		* STATUS_ON_ICC_UNSENT, STATUS_ON_ICC_FREE)
		* @param pdu the raw PDU to store
		* @return success or not
		*
		*/
		boolean updateMessageOnIccEf(int messageIndex, int newStatus,
		in byte[] pdu);

		/**
		* Copy a raw SMS PDU to the ICC.
		*
		* @param pdu the raw PDU to store
		* @param status message status (STATUS_ON_ICC_READ, STATUS_ON_ICC_UNREAD,
		* STATUS_ON_ICC_SENT, STATUS_ON_ICC_UNSENT)
		* @return success or not
		*
		*/
		boolean copyMessageToIccEf(int status, in byte[] pdu, in byte[] smsc);

		/**
		* Send a data SMS.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @param data the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applicaitons,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		void sendData(in String destAddr, in String scAddr, in int destPort,
		in byte[] data, in PendingIntent sentIntent, in PendingIntent deliveryIntent);

		/**
		* Send an SMS.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @param text the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applications,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		void sendText(in String destAddr, in String scAddr, in String text,
		in PendingIntent sentIntent, in PendingIntent deliveryIntent);

		/**
		* Send a multi-part text based SMS.
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress is the service center address or null to use
		* the current default SMSC
		* @param parts an <code>ArrayList</code> of strings that, in order,
		* comprise the original message
		* @param sentIntents if not null, an <code>ArrayList</code> of
		* <code>PendingIntent</code>s (one for each message part) that is
		* broadcast when the corresponding message part has been sent.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:
		* <code>RESULT_ERROR_GENERIC_FAILURE</code>
		* <code>RESULT_ERROR_RADIO_OFF</code>
		* <code>RESULT_ERROR_NULL_PDU</code>.
		* @param deliveryIntents if not null, an <code>ArrayList</code> of
		* <code>PendingIntent</code>s (one for each message part) that is
		* broadcast when the corresponding message part has been delivered
		* to the recipient. The raw pdu of the status report is in the
		* extended data ("pdu").
		*/
		void sendMultipartText(in String destinationAddress, in String scAddress,
		in List<String> parts, in List<PendingIntent> sentIntents,
		in List<PendingIntent> deliveryIntents);

		/**
		* Enable reception of cell broadcast (SMS-CB) messages with the given
		* message identifier. Note that if two different clients enable the same
		* message identifier, they must both disable it for the device to stop
		* receiving those messages.
		*
		* @param messageIdentifier Message identifier as specified in TS 23.041
		* @return true if successful, false otherwise
		*
		* @see #disableCellBroadcast(int)
		*/
		boolean enableCellBroadcast(int messageIdentifier);

		/**
		* Disable reception of cell broadcast (SMS-CB) messages with the given
		* message identifier. Note that if two different clients enable the same
		* message identifier, they must both disable it for the device to stop
		* receiving those messages.
		*
		* @param messageIdentifier Message identifier as specified in TS 23.041
		* @return true if successful, false otherwise
		*
		* @see #enableCellBroadcast(int)
		*/
		boolean disableCellBroadcast(int messageIdentifier);

		/**
		* Enable reception of cell broadcast (SMS-CB) messages with the given
		* message identifier range. Note that if two different clients enable
		* a message identifier range, they must both disable it for the device
		* to stop receiving those messages.
		*
		* @param startMessageId first message identifier as specified in TS 23.041
		* @param endMessageId last message identifier as specified in TS 23.041
		* @return true if successful, false otherwise
		*
		* @see #disableCellBroadcastRange(int, int)
		*/
		boolean enableCellBroadcastRange(int startMessageId, int endMessageId);

		/**
		* Disable reception of cell broadcast (SMS-CB) messages with the given
		* message identifier range. Note that if two different clients enable
		* a message identifier range, they must both disable it for the device
		* to stop receiving those messages.
		*
		* @param startMessageId first message identifier as specified in TS 23.041
		* @param endMessageId last message identifier as specified in TS 23.041
		* @return true if successful, false otherwise
		*
		* @see #enableCellBroadcastRange(int, int)
		*/
		boolean disableCellBroadcastRange(int startMessageId, int endMessageId);

		/**
		* Returns the premium SMS send permission for the specified package.
		* Requires system permission.
		*/
		int getPremiumSmsPermission(String packageName);

		/**
		* Set the SMS send permission for the specified package.
		* Requires system permission.
		*/
		void setPremiumSmsPermission(String packageName, int permission);
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -277,7 +277,6 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		return mSms;
		}

		@Override
		public void synthesizeMessages(String originatingAddress, String scAddress, List<String> messages, long timestampMillis) throws RemoteException {
		}

		@@ -394,8 +393,9 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		* extended data ("pdu").
		*/
		@Override
		public void sendMultipartText(String destAddr, String scAddr, List<String> parts,
		List<PendingIntent> sentIntents, List<PendingIntent> deliveryIntents) {
		public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) {
		if (Binder.getCallingPid() != android.os.Process.myPid()) {
		mPhone.getContext().enforceCallingPermission(
		Manifest.permission.SEND_SMS,

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub {
		ArrayList<PendingIntent> deliveryIntents = intent.getParcelableArrayListExtra("deliveryIntents");

		if (intent.getBooleanExtra("multipart", false)) {
		mIccSmsInterfaceManager.sendMultipartText(destAddr, scAddr,
		mIccSmsInterfaceManager.sendMultipartText(callingPackage, destAddr, scAddr,
		parts, sentIntents, deliveryIntents);
		return;
		}
		@@ -108,7 +108,6 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub {
		mContext.sendOrderedBroadcast(intent, permission);
		}

		@Override
		public void synthesizeMessages(String originatingAddress, String scAddress, List<String> messages, long timestampMillis) throws RemoteException {
		mContext.enforceCallingPermission(
		android.Manifest.permission.BROADCAST_SMS, "");