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

Commit 2aeb13f7 authored by Rana Mouawi's avatar Rana Mouawi
Browse files

Remove telecom_skip_log_based_on_extra flag and inline its usages. 

This flag is now eligible for cleanup.

Test: presubmit
Bug: b/409605402

Flag: EXEMPT removing telecom_skip_log_based_on_extra

Change-Id: I10bfac84a360550048c2310bdb35d084ab65ee42
parent 0d5aa724

flags/telecom_calllog_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -8,11 +8,3 @@ flag { 
  description: "log external call if current device is a wearable one"

  bug: "292600751"

}
 


# OWNER=ranamouawi TARGET=24Q2

flag {

  name: "telecom_skip_log_based_on_extra"

  namespace: "telecom"

  description: "skipping logging a call based on passed extra"

  bug: "295530944"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
            return false;

        }



        if (mFeatureFlags.telecomSkipLogBasedOnExtra() && call.getExtras() != null

        if (call.getExtras() != null

                && call.getExtras().containsKey(TelecomManager.EXTRA_DO_NOT_LOG_CALL)) {

            return false;

        }

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

+0 −26
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ public class CallLogManagerTest extends TelecomTestCase { 
    @SmallTest

    @Test

    public void testDoNotLogCallExtra() {

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

        Call fakeCall = makeFakeCall(

                DisconnectCause.LOCAL, // disconnectCauseCode

                false, // isConference
@@ -1109,31 +1108,6 @@ public class CallLogManagerTest extends TelecomTestCase { 
                false /* isCanceled */));

    }



    @SmallTest

    @Test

    public void testIgnoresDoNotLogCallExtra_whenFlagDisabled() {

        when(mFeatureFlags.telecomSkipLogBasedOnExtra()).thenReturn(false);

        Call fakeCall = makeFakeCall(

                DisconnectCause.LOCAL, // disconnectCauseCode

                false, // isConference

                true, // isIncoming

                1L, // creationTimeMillis

                1000L, // ageMillis

                TEL_PHONEHANDLE, // callHandle

                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        Bundle extras = new Bundle();

        extras.putBoolean(TelecomManager.EXTRA_DO_NOT_LOG_CALL, true);

        when(fakeCall.getExtras()).thenReturn(extras);



        assertTrue(mCallLogManager.shouldLogDisconnectedCall(fakeCall, CallState.DISCONNECTED,

                false /* isCanceled */));

    }



    @SmallTest

    @Test

    public void testDoNotLogConferenceWithChildren() {