Merge "Remove usage of getAutoPersisting(); it's always false." am: 5febe121c5 (26a8f113) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import android.provider.Telephony;
		import android.provider.Telephony.Sms.Intents;
		import android.service.carrier.CarrierMessagingService;
		import android.telephony.Rlog;
		import android.telephony.SmsManager;
		import android.telephony.SmsMessage;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		@@ -1258,15 +1257,6 @@ public abstract class InboundSmsHandler extends StateMachine {
		intent.setComponent(null);
		}

		// TODO: Validate that this is the right place to store the SMS.
		if (SmsManager.getDefault().getAutoPersisting()) {
		final Uri uri = writeInboxMessage(intent);
		if (uri != null) {
		// Pass this to SMS apps so that they know where it is stored
		intent.putExtra("uri", uri.toString());
		}
		}

		// Handle app specific sms messages.
		AppSmsManager appManager = mPhone.getAppSmsManager();
		if (appManager.handleSmsReceivedIntent(intent)) {

+0 −5

Original line number	Diff line number	Diff line
		@@ -337,11 +337,6 @@ public class WapPushOverSms implements ServiceConnection {
		return result.statusCode;
		}

		if (SmsManager.getDefault().getAutoPersisting()) {
		// Store the wap push data in telephony
		writeInboxMessage(result.subId, result.parsedPdu);
		}

		/**
		* If the pdu has application ID, WapPushManager substitute the message
		* processing. Since WapPushManager is optional module, if WapPushManager