Merge "Expose CarrierMessagingServiceWrapper as System API." (c73206d7) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -244,9 +244,10 @@ public class CarrierServicesSmsFilter {
		void filterSms(CarrierSmsFilterCallback smsFilterCallback) {
		mSmsFilterCallback = smsFilterCallback;
		if (!mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(
		mContext, mPackageName, ()-> onServiceReady())) {
		mContext, mPackageName, runnable -> runnable.run(), ()-> onServiceReady())) {
		loge("CarrierSmsFilter::filterSms: bindService() for failed for " + mPackageName);
		smsFilterCallback.onFilterComplete(CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT);
		smsFilterCallback.onReceiveSmsComplete(
		CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT);
		} else {
		logv("CarrierSmsFilter::filterSms: bindService() for succeeded for "
		+ mPackageName);
		@@ -260,12 +261,12 @@ public class CarrierServicesSmsFilter {
		private void onServiceReady() {
		try {
		log("onServiceReady: calling filterSms on " + mPackageName);
		mCarrierMessagingServiceWrapper.filterSms(
		mCarrierMessagingServiceWrapper.receiveSms(
		new MessagePdu(Arrays.asList(mPdus)), mSmsFormat, mDestPort,
		mPhone.getSubId(), mSmsFilterCallback);
		mPhone.getSubId(), runnable -> runnable.run(), mSmsFilterCallback);
		} catch (RuntimeException e) {
		loge("Exception filtering the SMS with " + mPackageName + ": " + e);
		mSmsFilterCallback.onFilterComplete(
		mSmsFilterCallback.onReceiveSmsComplete(
		CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT);
		}
		}
		@@ -293,7 +294,7 @@ public class CarrierServicesSmsFilter {
		* This method should be called only once.
		*/
		@Override
		public void onFilterComplete(int result) {
		public void onReceiveSmsComplete(int result) {
		log("CarrierSmsFilterCallback::onFilterComplete: Called from " + mPackageName
		+ " with result: " + result);
		// in the case that timeout has already passed and triggered, but the initial callback
		@@ -400,7 +401,7 @@ public class CarrierServicesSmsFilter {
		private void handleFilterCallbacksTimeout() {
		for (CarrierSmsFilterCallback callback : mFilterAggregator.mCallbacks) {
		log("handleFilterCallbacksTimeout: calling onFilterComplete");
		callback.onFilterComplete(CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT);
		callback.onReceiveSmsComplete(CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT);
		}
		}
		}

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -367,7 +367,8 @@ public abstract class SMSDispatcher extends Handler {
		SmsSenderCallback senderCallback) {
		mSenderCallback = senderCallback;
		if (!mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(
		mContext, carrierPackageName, ()->onServiceReady())) {
		mContext, carrierPackageName, runnable -> runnable.run(),
		()->onServiceReady())) {
		Rlog.e(TAG, "bindService() for carrier messaging service failed");
		mSenderCallback.onSendSmsComplete(
		CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK,
		@@ -402,6 +403,7 @@ public abstract class SMSDispatcher extends Handler {
		(mTracker.mDeliveryIntent != null)
		? CarrierMessagingService.SEND_FLAG_REQUEST_DELIVERY_STATUS
		: 0,
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e);
		@@ -441,6 +443,7 @@ public abstract class SMSDispatcher extends Handler {
		(mTracker.mDeliveryIntent != null)
		? CarrierMessagingService.SEND_FLAG_REQUEST_DELIVERY_STATUS
		: 0,
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e
		@@ -489,8 +492,8 @@ public abstract class SMSDispatcher extends Handler {
		}

		@Override
		public void onFilterComplete(int result) {
		Rlog.e(TAG, "Unexpected onFilterComplete call with result: " + result);
		public void onReceiveSmsComplete(int result) {
		Rlog.e(TAG, "Unexpected onReceiveSmsComplete call with result: " + result);
		}

		@Override
		@@ -563,7 +566,8 @@ public abstract class SMSDispatcher extends Handler {
		MultipartSmsSenderCallback senderCallback) {
		mSenderCallback = senderCallback;
		if (!mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(
		mContext, carrierPackageName, ()->onServiceReady())) {
		mContext, carrierPackageName, runnable -> runnable.run(),
		()->onServiceReady())) {
		Rlog.e(TAG, "bindService() for carrier messaging service failed");
		mSenderCallback.onSendMultipartSmsComplete(
		CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK,
		@@ -590,6 +594,7 @@ public abstract class SMSDispatcher extends Handler {
		statusReportRequested
		? CarrierMessagingService.SEND_FLAG_REQUEST_DELIVERY_STATUS
		: 0,
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e);
		@@ -638,8 +643,8 @@ public abstract class SMSDispatcher extends Handler {
		}

		@Override
		public void onFilterComplete(int result) {
		Rlog.e(TAG, "Unexpected onFilterComplete call with result: " + result);
		public void onReceiveSmsComplete(int result) {
		Rlog.e(TAG, "Unexpected onReceiveSmsComplete call with result: " + result);
		}

		@Override