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

Commit 58d58a89 authored by Thomas Stuart's avatar Thomas Stuart Committed by Android (Google) Code Review
Browse files

Merge "rm checkCompletedFiltersOnTimeout" into main

parents b37f772c 56a7e0a0

flags/telecom_call_filtering_flags.aconfig

+1 −12
Original line number Diff line number Diff line
@@ -8,14 +8,3 @@ flag { 
  description: "Gates whether to still perform Dnd filter when phone account has skip_filter call extra."

  bug: "222333869"

}
 
 No newline at end of file
 


# OWNER=tjstuart TARGET=25Q1

flag {

  name: "check_completed_filters_on_timeout"

  namespace: "telecom"

  description: "If the Filtering Graph times out, combine the finished results"

  bug: "364946812"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

src/com/android/server/telecom/callfiltering/IncomingCallFilterGraph.java

+0 −3
Original line number Diff line number Diff line
@@ -151,9 +151,6 @@ public class IncomingCallFilterGraph { 
    private CallFilteringResult onTimeoutCombineFinishedFilters(

            List<CallFilter> filtersList,

            CallFilteringResult currentResult) {

        if (!mFeatureFlags.checkCompletedFiltersOnTimeout()) {

            return currentResult;

        }

        for (CallFilter filter : filtersList) {

            if (filter.result != null) {

                currentResult = currentResult.combine(filter.result);

tests/src/com/android/server/telecom/tests/IncomingCallFilterGraphTest.java

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ public class IncomingCallFilterGraphTest extends TelecomTestCase { 


        // WHEN:  DND is on and the caller cannot interrupt and the graph is processed

        when(mockRinger.shouldRingForContact(mCall)).thenReturn(false);

        when(mFeatureFlags.checkCompletedFiltersOnTimeout()).thenReturn(true);

        dndCallFilter.startFilterLookup(IncomingCallFilterGraph.DEFAULT_RESULT);

        graph.performFiltering();