Loading src/java/com/android/internal/telephony/SMSDispatcher.java +10 −8 Original line number Original line Diff line number Diff line Loading @@ -15,6 +15,15 @@ */ */ package com.android.internal.telephony; package com.android.internal.telephony; import static android.Manifest.permission.SEND_SMS_NO_CONFIRMATION; import static android.telephony.SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_LIMIT_EXCEEDED; import static android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE; import static android.telephony.SmsManager.RESULT_ERROR_NULL_PDU; import static android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF; import android.annotation.Nullable; import android.annotation.Nullable; import android.app.Activity; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog; Loading Loading @@ -75,14 +84,6 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger; import static android.Manifest.permission.SEND_SMS_NO_CONFIRMATION; import static android.telephony.SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_LIMIT_EXCEEDED; import static android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE; import static android.telephony.SmsManager.RESULT_ERROR_NULL_PDU; import static android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF; public abstract class SMSDispatcher extends Handler { public abstract class SMSDispatcher extends Handler { static final String TAG = "SMSDispatcher"; // accessed from inner class static final String TAG = "SMSDispatcher"; // accessed from inner class static final boolean DBG = false; static final boolean DBG = false; Loading Loading @@ -1734,6 +1735,7 @@ public abstract class SMSDispatcher extends Handler { List<String> carrierPackages = card.getCarrierPackageNamesForIntent( List<String> carrierPackages = card.getCarrierPackageNamesForIntent( mContext.getPackageManager(), new Intent(CarrierMessagingService.SERVICE_INTERFACE)); mContext.getPackageManager(), new Intent(CarrierMessagingService.SERVICE_INTERFACE)); // TODO: Add Check for IMS app if there are no carrier packages. return (carrierPackages != null && carrierPackages.size() == 1) ? return (carrierPackages != null && carrierPackages.size() == 1) ? carrierPackages.get(0) : null; carrierPackages.get(0) : null; } } Loading Loading
src/java/com/android/internal/telephony/SMSDispatcher.java +10 −8 Original line number Original line Diff line number Diff line Loading @@ -15,6 +15,15 @@ */ */ package com.android.internal.telephony; package com.android.internal.telephony; import static android.Manifest.permission.SEND_SMS_NO_CONFIRMATION; import static android.telephony.SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_LIMIT_EXCEEDED; import static android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE; import static android.telephony.SmsManager.RESULT_ERROR_NULL_PDU; import static android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF; import android.annotation.Nullable; import android.annotation.Nullable; import android.app.Activity; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog; Loading Loading @@ -75,14 +84,6 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger; import static android.Manifest.permission.SEND_SMS_NO_CONFIRMATION; import static android.telephony.SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE; import static android.telephony.SmsManager.RESULT_ERROR_LIMIT_EXCEEDED; import static android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE; import static android.telephony.SmsManager.RESULT_ERROR_NULL_PDU; import static android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF; public abstract class SMSDispatcher extends Handler { public abstract class SMSDispatcher extends Handler { static final String TAG = "SMSDispatcher"; // accessed from inner class static final String TAG = "SMSDispatcher"; // accessed from inner class static final boolean DBG = false; static final boolean DBG = false; Loading Loading @@ -1734,6 +1735,7 @@ public abstract class SMSDispatcher extends Handler { List<String> carrierPackages = card.getCarrierPackageNamesForIntent( List<String> carrierPackages = card.getCarrierPackageNamesForIntent( mContext.getPackageManager(), new Intent(CarrierMessagingService.SERVICE_INTERFACE)); mContext.getPackageManager(), new Intent(CarrierMessagingService.SERVICE_INTERFACE)); // TODO: Add Check for IMS app if there are no carrier packages. return (carrierPackages != null && carrierPackages.size() == 1) ? return (carrierPackages != null && carrierPackages.size() == 1) ? carrierPackages.get(0) : null; carrierPackages.get(0) : null; } } Loading