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

Commit cb3a48d0 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev

parents 65a9e93c ddf3f9c4

src/com/android/server/telecom/CallsManager.java

+6 −0
Original line number Diff line number Diff line
@@ -348,6 +348,12 @@ public class CallsManager extends Call.ListenerBase 
    @Override

    public void onSuccessfulIncomingCall(Call incomingCall) {

        Log.d(this, "onSuccessfulIncomingCall");

        if (incomingCall.hasProperty(Connection.PROPERTY_EMERGENCY_CALLBACK_MODE)) {

            Log.i(this, "Skipping call filtering due to ECBM");

            onCallFilteringComplete(incomingCall, new CallFilteringResult(true, false, true, true));

            return;

        }



        List<IncomingCallFilter.CallFilter> filters = new ArrayList<>();

        filters.add(new DirectToVoicemailCallFilter(mCallerInfoLookupHelper));

        filters.add(new AsyncBlockCheckFilter(mContext, new BlockCheckerAdapter()));

src/com/android/server/telecom/ParcelableCallUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ public class ParcelableCallUtils { 
        Connection.PROPERTY_GENERIC_CONFERENCE,

        android.telecom.Call.Details.PROPERTY_GENERIC_CONFERENCE,



        Connection.PROPERTY_SHOW_CALLBACK_NUMBER,

        Connection.PROPERTY_EMERGENCY_CALLBACK_MODE,

        android.telecom.Call.Details.PROPERTY_EMERGENCY_CALLBACK_MODE,



        Connection.PROPERTY_IS_EXTERNAL_CALL,