| commit | c9459231079b577d07824c802740ed169d498282 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Fri Sep 25 21:16:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 25 21:16:42 2020 +0000 |
| tree | c0fe45efe5d8728d74f9aef33aaa6a6634ca8451 | |
| parent | dd83fe0d28f7676a2597de30a8cdf5d5bfd82fe9 [diff] | |
| parent | 8a0e53e8bb12c036c56dd8abda902a00dbfd8094 [diff] |
Cell location check for 3GPP cell broadcast messages only am: 8a0e53e8bb Original change: https://android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/1439231 Change-Id: I6d36b2d87cf4f643a8c341e10a2bf7dd61bff2db
diff --git a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java index 1378ebb..bbce188 100644 --- a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java +++ b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
@@ -478,8 +478,11 @@ continue; } - // Check if the message location is different - if (!isSameLocation(message, messageToCheck)) { + // Check if the message location is different. Note this is only applicable to + // 3GPP format cell broadcast messages. + if (message.getMessageFormat() == SmsCbMessage.MESSAGE_FORMAT_3GPP + && messageToCheck.getMessageFormat() == SmsCbMessage.MESSAGE_FORMAT_3GPP + && !isSameLocation(message, messageToCheck)) { if (VDBG) log("Location does not match."); // Not a dup. Check next one. continue;