commit 3f6c391d14585948e36f123a690241cda2fdcceb
author Aishwarya Mallampati <amallampati@google.com> Thu Aug 31 11:28:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 31 11:28:20 2023 +0000
tree 238f50feeee94d902dd15f4146261c36380ba037
parent 443bef7c6d3fc3a5c608634a8862774c98df5af7
parent a01a0b47927295ed1c3b678792459265b02e2ab0

Merge "Increase FILTER_COMPLETE_TIMEOUT_MS." into main

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

diff --git a/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java b/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java
index 33cde4f..e187989 100644
--- a/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java
+++ b/src/java/com/android/internal/telephony/CarrierServicesSmsFilter.java
@@ -58,7 +58,7 @@
     public static final int EVENT_ON_FILTER_COMPLETE_NOT_CALLED = 1;
 
     /** onFilterComplete timeout. */
-    public static final int FILTER_COMPLETE_TIMEOUT_MS = 10 * 60 * 1000; //10 minutes
+    public static final int FILTER_COMPLETE_TIMEOUT_MS = 12 * 60 * 1000; //12 minutes
 
     /** SMS anomaly uuid -- CarrierMessagingService did not respond */
     private static final UUID sAnomalyNoResponseFromCarrierMessagingService =
@@ -381,7 +381,9 @@
         }
 
         private void addToCallbacks(CarrierSmsFilterCallback callback) {
-            mCallbacks.add(callback);
+            synchronized (mFilterLock) {
+                mCallbacks.add(callback);
+            }
         }
 
     }