Merge "Quick style fixup of ISmsImplBase" (76c9a2fd) · Commits · e / os / android_frameworks_opt_telephony

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

+27 −28

Original line number	Diff line number	Diff line
		@@ -39,10 +39,9 @@ import java.io.PrintWriter;
		import java.util.List;

		/**
		* UiccSmsController to provide an inter-process communication to
		* access Sms in Icc.
		* Implements the ISmsImplBase interface used in the SmsManager API.
		*/
		public class UiccSmsController extends ISmsBaseImpl {
		public class UiccSmsController extends ISmsImplBase {
		static final String LOG_TAG = "RIL_UiccSmsController";

		protected UiccSmsController() {
		@@ -60,9 +59,8 @@ public class UiccSmsController extends ISmsBaseImpl {
		}

		@Override
		public boolean
		updateMessageOnIccEfForSubscriber(int subId, String callingPackage, int index, int status,
		byte[] pdu) {
		public boolean updateMessageOnIccEfForSubscriber(int subId, String callingPackage, int index,
		int status, byte[] pdu) {
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		return iccSmsIntMgr.updateMessageOnIccEf(callingPackage, index, status, pdu);
		@@ -114,6 +112,7 @@ public class UiccSmsController extends ISmsBaseImpl {
		}
		}

		@Override
		public void sendDataForSubscriberWithSelfPermissions(int subId, String callingPackage,
		String destAddr, String scAddr, int destPort, byte[] data, PendingIntent sentIntent,
		PendingIntent deliveryIntent) {
		@@ -127,12 +126,6 @@ public class UiccSmsController extends ISmsBaseImpl {
		}
		}

		public void sendText(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		sendTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr, scAddr,
		text, sentIntent, deliveryIntent, true /* persistMessageForNonDefaultSmsApp*/);
		}

		@Override
		public void sendTextForSubscriber(int subId, String callingPackage, String destAddr,
		String scAddr, String text, PendingIntent sentIntent, PendingIntent deliveryIntent,
		@@ -148,6 +141,7 @@ public class UiccSmsController extends ISmsBaseImpl {
		}
		}

		@Override
		public void sendTextForSubscriberWithSelfPermissions(int subId, String callingPackage,
		String destAddr, String scAddr, String text, PendingIntent sentIntent,
		PendingIntent deliveryIntent, boolean persistMessage) {
		@@ -176,14 +170,6 @@ public class UiccSmsController extends ISmsBaseImpl {
		}
		}

		public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) {
		sendMultipartTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr,
		scAddr, parts, sentIntents, deliveryIntents,
		true /* persistMessageForNonDefaultSmsApp */);
		}

		@Override
		public void sendMultipartTextForSubscriber(int subId, String callingPackage, String destAddr,
		String scAddr, List<String> parts, List<PendingIntent> sentIntents,
		@@ -354,14 +340,6 @@ public class UiccSmsController extends ISmsBaseImpl {
		}
		}

		/**
		* Get sms interface manager object based on subscription.
		* @return ICC SMS manager
		*/
		private @Nullable IccSmsInterfaceManager getIccSmsInterfaceManager(int subId) {
		return getPhone(subId).getIccSmsInterfaceManager();
		}

		/**
		* Get User preferred SMS subscription
		* @return User preferred SMS subscription
		@@ -429,6 +407,19 @@ public class UiccSmsController extends ISmsBaseImpl {
		indentingPW.flush();
		}

		public void sendText(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		sendTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr, scAddr,
		text, sentIntent, deliveryIntent, true /* persistMessageForNonDefaultSmsApp*/);
		}

		public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) {
		sendMultipartTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr,
		scAddr, parts, sentIntents, deliveryIntents,
		true /* persistMessageForNonDefaultSmsApp */);
		}

		private void sendErrorInPendingIntent(@Nullable PendingIntent intent, int errorCode) {
		if (intent != null) {
		@@ -444,4 +435,12 @@ public class UiccSmsController extends ISmsBaseImpl {
		sendErrorInPendingIntent(intent, errorCode);
		}
		}

		/**
		* Get sms interface manager object based on subscription.
		* @return ICC SMS manager
		*/
		private @Nullable IccSmsInterfaceManager getIccSmsInterfaceManager(int subId) {
		return getPhone(subId).getIccSmsInterfaceManager();
		}
		}