Merge "Fix race condition between SmsDispatcher and CarrierMessagingService" into sc-dev (dbe48e2c) · Commits · e / os / android_frameworks_opt_telephony

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

+25 −12

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ import com.android.telephony.Rlog;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Random;
		@@ -374,7 +375,7 @@ public abstract class SMSDispatcher extends Handler {
		/**
		* Bind to carrierPackageName to send message through it
		*/
		public void sendSmsByCarrierApp(String carrierPackageName,
		public synchronized void sendSmsByCarrierApp(String carrierPackageName,
		CarrierMessagingCallback senderCallback) {
		mCarrierPackageName = carrierPackageName;
		mSenderCallback = senderCallback;
		@@ -390,7 +391,10 @@ public abstract class SMSDispatcher extends Handler {
		}

		/**
		* Callback received from mCarrierPackageName on binding to it is done
		* Callback received from mCarrierPackageName on binding to it is done.
		* NOTE: the implementations of this method must be synchronized to make sure it does not
		* get called before {@link #sendSmsByCarrierApp} completes and {@link #EVENT_TIMEOUT} is
		* posted
		*/
		public abstract void onServiceReady();

		@@ -412,8 +416,8 @@ public abstract class SMSDispatcher extends Handler {
		@Override
		public void handleMessage(Message msg) {
		if (msg.what == EVENT_TIMEOUT) {
		logWithLocalLog("handleMessage: did not receive response from "
		+ mCarrierPackageName + " for " + mCarrierMessagingTimeout + " ms");
		logWithLocalLog("handleMessage: No response from " + mCarrierPackageName
		+ " for " + mCarrierMessagingTimeout + " ms");
		AnomalyReporter.reportAnomaly(sAnomalyNoResponseFromCarrierMessagingService,
		"No response from " + mCarrierPackageName);
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		@@ -443,7 +447,8 @@ public abstract class SMSDispatcher extends Handler {
		}

		@Override
		public void onServiceReady() {
		public synchronized void onServiceReady() {
		Rlog.d(TAG, "TextSmsSender::onServiceReady");
		HashMap<String, Object> map = mTracker.getData();
		String text = (String) map.get(MAP_KEY_TEXT);

		@@ -459,10 +464,12 @@ public abstract class SMSDispatcher extends Handler {
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e.getMessage());
		Rlog.e(TAG, "TextSmsSender::onServiceReady: Exception sending the SMS: "
		+ e.getMessage());
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		}
		} else {
		Rlog.d(TAG, "TextSmsSender::onServiceReady: text == null");
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		}
		}
		@@ -495,7 +502,8 @@ public abstract class SMSDispatcher extends Handler {
		}

		@Override
		public void onServiceReady() {
		public synchronized void onServiceReady() {
		Rlog.d(TAG, "DataSmsSender::onServiceReady");
		HashMap<String, Object> map = mTracker.getData();
		byte[] data = (byte[]) map.get(MAP_KEY_DATA);
		int destPort = (int) map.get(MAP_KEY_DEST_PORT);
		@@ -513,11 +521,12 @@ public abstract class SMSDispatcher extends Handler {
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e
		Rlog.e(TAG, "DataSmsSender::onServiceReady: Exception sending the SMS: " + e
		+ " " + SmsController.formatCrossStackMessageId(mTracker.mMessageId));
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		}
		} else {
		Rlog.d(TAG, "DataSmsSender::onServiceReady: data == null");
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		}
		}
		@@ -556,6 +565,7 @@ public abstract class SMSDispatcher extends Handler {
		*/
		@Override
		public void onSendSmsComplete(int result, int messageRef) {
		Rlog.d(TAG, "onSendSmsComplete: result=" + result + " messageRef=" + messageRef);
		if (mCallbackCalled) {
		logWithLocalLog("onSendSmsComplete: unexpected call");
		AnomalyReporter.reportAnomaly(sAnomalyUnexpectedCallback,
		@@ -655,7 +665,8 @@ public abstract class SMSDispatcher extends Handler {
		}

		@Override
		public void onServiceReady() {
		public synchronized void onServiceReady() {
		Rlog.d(TAG, "MultipartSmsSender::onServiceReady");
		boolean statusReportRequested = false;
		for (SmsTracker tracker : mTrackers) {
		if (tracker.mDeliveryIntent != null) {
		@@ -675,7 +686,7 @@ public abstract class SMSDispatcher extends Handler {
		runnable -> runnable.run(),
		mSenderCallback);
		} catch (RuntimeException e) {
		Rlog.e(TAG, "Exception sending the SMS: " + e);
		Rlog.e(TAG, "MultipartSmsSender::onServiceReady: Exception sending the SMS: " + e);
		onSendComplete(CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK);
		}
		}
		@@ -719,6 +730,8 @@ public abstract class SMSDispatcher extends Handler {
		*/
		@Override
		public void onSendMultipartSmsComplete(int result, int[] messageRefs) {
		Rlog.d(TAG, "onSendMultipartSmsComplete: result=" + result + " messageRefs="
		+ Arrays.toString(messageRefs));
		if (mCallbackCalled) {
		logWithLocalLog("onSendMultipartSmsComplete: unexpected call");
		AnomalyReporter.reportAnomaly(sAnomalyUnexpectedCallback,
		@@ -1274,7 +1287,7 @@ public abstract class SMSDispatcher extends Handler {
		private boolean sendSmsByCarrierApp(boolean isDataSms, SmsTracker tracker ) {
		String carrierPackage = getCarrierAppPackageName();
		if (carrierPackage != null) {
		Rlog.d(TAG, "Found carrier package.");
		Rlog.d(TAG, "Found carrier package " + carrierPackage);
		SmsSender smsSender;
		if (isDataSms) {
		smsSender = new DataSmsSender(tracker);
		@@ -1485,7 +1498,7 @@ public abstract class SMSDispatcher extends Handler {

		String carrierPackage = getCarrierAppPackageName();
		if (carrierPackage != null) {
		Rlog.d(TAG, "Found carrier package."
		Rlog.d(TAG, "Found carrier package " + carrierPackage
		+ " id: " + getMultiTrackermessageId(trackers));
		MultipartSmsSender smsSender = new MultipartSmsSender(parts, trackers);
		smsSender.sendSmsByCarrierApp(carrierPackage,