Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1417989e authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Remove dup messageId log" am: 016f2406 am: d13be88b am: 5db2cc98... 

Merge "Remove dup messageId log" am: 016f2406 am: d13be88b am: 5db2cc98 am: 76707405 am: ce0eb8f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1425509

Change-Id: I19e98bddee8d77221eb854a8e32cbda306ffbd8c
parents eec4c131 ce0eb8f4

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

+2 −2
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                if (cursor.getInt(

                        PDU_DELETED_FLAG_PROJECTION_INDEX_MAPPING.get(DELETED_FLAG_COLUMN)) == 1) {

                    logWithLocalLog("checkAndHandleDuplicate: Discarding duplicate "

                            + "message/segment: " + tracker, tracker.getMessageId());

                            + "message/segment: " + tracker);

                    logDupPduMismatch(cursor, tracker);

                    return true;   // reject message

                } else {
@@ -1463,7 +1463,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                        deleteFromRawTable(exactMatchQuery.first, exactMatchQuery.second,

                                DELETE_PERMANENTLY);

                        logWithLocalLog("checkAndHandleDuplicate: Replacing duplicate message: "

                                + tracker, tracker.getMessageId());

                                + tracker);

                        logDupPduMismatch(cursor, tracker);

                    }

                }