Merge "Block SMS, and MMS from blocked numbers."

1 files changed, 9 insertions, 3 deletions

diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index ca28dc8a1..80be5d244 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -96,7 +96,7 @@ import java.util.List;
  */
 public abstract class InboundSmsHandler extends StateMachine {
     protected static final boolean DBG = true;
-    private static final boolean VDBG = false;  // STOPSHIP if true, logs user data
+    private static final boolean VDBG = false; // STOPSHIP if true, logs user data
 
     /** Query projection for checking for duplicate message segments. */
     private static final String[] PDU_PROJECTION = {
@@ -636,7 +636,7 @@ public abstract class InboundSmsHandler extends StateMachine {
             }
 
             tracker = new InboundSmsTracker(sms.getPdu(), sms.getTimestampMillis(), destPort,
-                    is3gpp2(), false);
+                    is3gpp2(), false, sms.getDisplayOriginatingAddress());
         } else {
             // Create a tracker for this message segment.
             SmsHeader.ConcatRef concatRef = smsHeader.concatRef;
@@ -644,7 +644,7 @@ public abstract class InboundSmsHandler extends StateMachine {
             int destPort = (portAddrs != null ? portAddrs.destPort : -1);
 
             tracker = new InboundSmsTracker(sms.getPdu(), sms.getTimestampMillis(), destPort,
-                    is3gpp2(), sms.getOriginatingAddress(), concatRef.refNumber,
+                    is3gpp2(), sms.getDisplayOriginatingAddress(), concatRef.refNumber,
                     concatRef.seqNumber, concatRef.msgCount, false);
         }
 
@@ -766,6 +766,12 @@ public abstract class InboundSmsHandler extends StateMachine {
             }
         }
 
+        if (BlockChecker.isBlocked(mContext,
+                tracker.getAddress())) {
+            deleteFromRawTable(tracker.getDeleteWhere(), tracker.getDeleteWhereArgs());
+            return false;
+        }
+
         List<String> carrierPackages = null;
         UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
         if (card != null) {