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

Commit 82aedf95 authored by Grant Menke's avatar Grant Menke Committed by Android (Google) Code Review
Browse files

Merge "Prevent concurrent modifiation of Call mExtras." into udc-dev

parents d2c7c97f 22057bbd

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

+3 −0
Original line number Diff line number Diff line
@@ -868,6 +868,9 @@ public class CallsManager extends Call.ListenerBase 
            return;

        }



        // Store the shouldSuppress value in the call object which will be passed to InCallServices

        incomingCall.setCallIsSuppressedByDoNotDisturb(result.shouldSuppressCallDueToDndStatus);



        // Inform our connection service that call filtering is done (if it was performed at all).

        if (incomingCall.isUsingCallFiltering()) {

            boolean isInContacts = incomingCall.getCallerInfo() != null

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

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ public class DndCallFilter extends CallFilter { 
        // query NotificationManager to determine if the call should ring or be suppressed

        boolean shouldSuppress = !mRinger.shouldRingForContact(mCall);



        // store the shouldSuppress value in the call object which will be passed to InCallServices

        mCall.setCallIsSuppressedByDoNotDisturb(shouldSuppress);



        // end timer

        Log.addEvent(mCall, LogUtils.Events.DND_PRE_CHECK_COMPLETED, shouldSuppress);

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

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ public class MissedInformationTest extends TelecomSystemTest { 
        doReturn(mNotificationManager).when(mSpyContext)

                .getSystemService(Context.NOTIFICATION_SERVICE);

        doReturn(false).when(mNotificationManager).matchesCallFilter(any(Bundle.class));

        doReturn(false).when(mIncomingCall).wasDndCheckComputedForCall();

        mCallsManager.getRinger().setNotificationManager(mNotificationManager);



        CallFilteringResult result = new CallFilteringResult.Builder()