Merge "UiccSmsController: Extend ISmsBaseImpl" (100a848d) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −18

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.app.PendingIntent;
		import android.content.Context;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Telephony.Sms.Intents;
		import android.telephony.Rlog;
		@@ -43,7 +42,7 @@ import java.util.List;
		* UiccSmsController to provide an inter-process communication to
		* access Sms in Icc.
		*/
		public class UiccSmsController extends ISms.Stub {
		public class UiccSmsController extends ISmsBaseImpl {
		static final String LOG_TAG = "RIL_UiccSmsController";

		protected UiccSmsController() {
		@@ -63,7 +62,7 @@ public class UiccSmsController extends ISms.Stub {
		@Override
		public boolean
		updateMessageOnIccEfForSubscriber(int subId, String callingPackage, int index, int status,
		byte[] pdu) throws android.os.RemoteException {
		byte[] pdu) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		return iccSmsIntMgr.updateMessageOnIccEf(callingPackage, index, status, pdu);
		@@ -76,7 +75,7 @@ public class UiccSmsController extends ISms.Stub {

		@Override
		public boolean copyMessageToIccEfForSubscriber(int subId, String callingPackage, int status,
		byte[] pdu, byte[] smsc) throws android.os.RemoteException {
		byte[] pdu, byte[] smsc) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		return iccSmsIntMgr.copyMessageToIccEf(callingPackage, status, pdu, smsc);
		@@ -88,8 +87,7 @@ public class UiccSmsController extends ISms.Stub {
		}

		@Override
		public List<SmsRawData> getAllMessagesFromIccEfForSubscriber(int subId, String callingPackage)
		throws android.os.RemoteException {
		public List<SmsRawData> getAllMessagesFromIccEfForSubscriber(int subId, String callingPackage) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		return iccSmsIntMgr.getAllMessagesFromIccEf(callingPackage);
		@@ -180,7 +178,7 @@ public class UiccSmsController extends ISms.Stub {

		public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) throws android.os.RemoteException {
		List<PendingIntent> deliveryIntents) {
		sendMultipartTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr,
		scAddr, parts, sentIntents, deliveryIntents,
		true /* persistMessageForNonDefaultSmsApp */);
		@@ -189,8 +187,7 @@ public class UiccSmsController extends ISms.Stub {
		@Override
		public void sendMultipartTextForSubscriber(int subId, String callingPackage, String destAddr,
		String scAddr, List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents, boolean persistMessageForNonDefaultSmsApp)
		throws android.os.RemoteException {
		List<PendingIntent> deliveryIntents, boolean persistMessageForNonDefaultSmsApp) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null ) {
		iccSmsIntMgr.sendMultipartText(callingPackage, destAddr, scAddr, parts, sentIntents,
		@@ -219,15 +216,14 @@ public class UiccSmsController extends ISms.Stub {
		}

		@Override
		public boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)
		throws android.os.RemoteException {
		public boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType) {
		return enableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,
		ranType);
		}

		@Override
		public boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId,
		int endMessageId, int ranType) throws android.os.RemoteException {
		int endMessageId, int ranType) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null ) {
		return iccSmsIntMgr.enableCellBroadcastRange(startMessageId, endMessageId, ranType);
		@@ -239,15 +235,15 @@ public class UiccSmsController extends ISms.Stub {
		}

		@Override
		public boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)
		throws android.os.RemoteException {
		public boolean disableCellBroadcastForSubscriber(int subId,
		int messageIdentifier, int ranType) {
		return disableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,
		ranType);
		}

		@Override
		public boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId,
		int endMessageId, int ranType) throws android.os.RemoteException {
		int endMessageId, int ranType) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null ) {
		return iccSmsIntMgr.disableCellBroadcastRange(startMessageId, endMessageId, ranType);
		@@ -386,7 +382,7 @@ public class UiccSmsController extends ISms.Stub {

		@Override
		public void sendStoredText(int subId, String callingPkg, Uri messageUri, String scAddress,
		PendingIntent sentIntent, PendingIntent deliveryIntent) throws RemoteException {
		PendingIntent sentIntent, PendingIntent deliveryIntent) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		iccSmsIntMgr.sendStoredText(callingPkg, messageUri, scAddress, sentIntent,
		@@ -399,8 +395,8 @@ public class UiccSmsController extends ISms.Stub {

		@Override
		public void sendStoredMultipartText(int subId, String callingPkg, Uri messageUri,
		String scAddress, List<PendingIntent> sentIntents, List<PendingIntent> deliveryIntents)
		throws RemoteException {
		String scAddress, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null ) {
		iccSmsIntMgr.sendStoredMultipartText(callingPkg, messageUri, scAddress, sentIntents,