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

Commit c0b228b5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13473899 from 58d58a89 to 25Q3-release 

Change-Id: Id95e3e839f9622034a12ec5d21b9efa79d0e7538
parents f826e3ff 58d58a89

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();