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

Commit baf52ba1 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Record Call's Via Number in Call Extras to CallLog 

Add a column to the CallLog Backup that records the secondary line
number that an incoming call has been received on. More specifically, a
call is assumed to be considered a "VIA number" if the call's incoming
line number does not match the number registered with the SIM card.

BUG: 25594198

Change-Id: I1bdc949fcee836945eec905b6a0afeec52b4ca29
parent d9d8fb65

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

+17 −0
Original line number Diff line number Diff line
@@ -231,6 +231,12 @@ public class Call implements CreateConnectionResponse { 
     */

    private final String mPostDialDigits;



    /**

     * The secondary line number that an incoming call has been received on if the SIM subscription

     * has multiple associated numbers.

     */

    private String mViaNumber = "";



    /**

     * The time this call was created. Beyond logging and such, may also be used for bookkeeping

     * and specifically for marking certain call attempts as failed attempts.
@@ -720,6 +726,17 @@ public class Call implements CreateConnectionResponse { 
        return mPostDialDigits;

    }



    public String getViaNumber() {

        return mViaNumber;

    }



    public void setViaNumber(String viaNumber) {

        // If at any point the via number is not empty throughout the call, save that via number.

        if (!TextUtils.isEmpty(viaNumber)) {

            mViaNumber = viaNumber;

        }

    }



    int getHandlePresentation() {

        return mHandlePresentation;

    }

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

+11 −8
Original line number Diff line number Diff line
@@ -57,14 +57,15 @@ public final class CallLogManager extends CallsManagerListenerBase { 
         * @param durationInMillis Duration of the call (milliseconds).

         * @param dataUsage Data usage in bytes, or null if not applicable.

         */

        public AddCallArgs(Context context, CallerInfo callerInfo, String number, String postDialDigits,

                int presentation, int callType, int features, PhoneAccountHandle accountHandle,

                long creationDate, long durationInMillis, Long dataUsage,

                UserHandle initiatingUser) {

        public AddCallArgs(Context context, CallerInfo callerInfo, String number,

                String postDialDigits, String viaNumber, int presentation, int callType,

                int features, PhoneAccountHandle accountHandle, long creationDate,

                long durationInMillis, Long dataUsage, UserHandle initiatingUser) {

            this.context = context;

            this.callerInfo = callerInfo;

            this.number = number;

            this.postDialDigits = postDialDigits;

            this.viaNumber = viaNumber;

            this.presentation = presentation;

            this.callType = callType;

            this.features = features;
@@ -80,6 +81,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        public final CallerInfo callerInfo;

        public final String number;

        public final String postDialDigits;

        public final String viaNumber;

        public final int presentation;

        public final int callType;

        public final int features;
@@ -162,7 +164,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
                call.getCallDataUsage();



        int callFeatures = getCallFeatures(call.getVideoStateHistory());

        logCall(call.getCallerInfo(), logNumber, call.getPostDialDigits(),

        logCall(call.getCallerInfo(), logNumber, call.getPostDialDigits(), call.getViaNumber(),

                call.getHandlePresentation(), callLogType, callFeatures, accountHandle,

                creationTime, age, callDataUsage, call.isEmergencyCall(), call.getInitiatingUser());

    }
@@ -186,6 +188,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
            CallerInfo callerInfo,

            String number,

            String postDialDigits,

            String viaNumber,

            int presentation,

            int callType,

            int features,
@@ -218,8 +221,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
                    + Log.pii(number) + "," + presentation + ", " + callType

                    + ", " + start + ", " + duration);

            AddCallArgs args = new AddCallArgs(mContext, callerInfo, number, postDialDigits,

                    presentation, callType, features, accountHandle, start, duration, dataUsage,

                    initiatingUser);

                    viaNumber, presentation, callType, features, accountHandle, start, duration,

                    dataUsage, initiatingUser);

            logCallAsync(args);

        } else {

          Log.d(TAG, "Not adding emergency call to call log.");
@@ -323,7 +326,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
         *                         if insert to all users except managed profile.

         */

        private Uri addCall(AddCallArgs c, UserHandle userToBeInserted) {

            return Calls.addCall(c.callerInfo, c.context, c.number, c.postDialDigits,

            return Calls.addCall(c.callerInfo, c.context, c.number, c.postDialDigits, c.viaNumber,

                    c.presentation, c.callType, c.features, c.accountHandle, c.timestamp,

                    c.durationInSec, c.dataUsage, userToBeInserted == null,

                    userToBeInserted);

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

+10 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,7 @@ public class CallsManager extends Call.ListenerBase 
            return;

        }

        handleCallTechnologyChange(c);

        handleChildAddressChange(c);

    }



    private void handleCallTechnologyChange(Call call) {
@@ -1164,6 +1165,15 @@ public class CallsManager extends Call.ListenerBase 
        }

    }



    public void handleChildAddressChange(Call call) {

        if (call.getExtras() != null

                && call.getExtras().containsKey(Connection.EXTRA_CHILD_ADDRESS)) {



            String viaNumber = call.getExtras().getString(Connection.EXTRA_CHILD_ADDRESS);

            call.setViaNumber(viaNumber);

        }

    }



    /** Called by the in-call UI to change the mute state. */

    void mute(boolean shouldMute) {

        mCallAudioManager.mute(shouldMute);

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

+27 −7
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
    private static final int NO_VIDEO_STATE = VideoProfile.STATE_AUDIO_ONLY;

    private static final int BIDIRECTIONAL_VIDEO_STATE = VideoProfile.STATE_BIDIRECTIONAL;

    private static final String POST_DIAL_STRING = ";12345";

    private static final String VIA_NUMBER_STRING = "5555555678";

    private static final String TEST_PHONE_ACCOUNT_ID= "testPhoneAccountId";



    private static final int TEST_TIMEOUT_MILLIS = 200;
@@ -144,7 +145,8 @@ public class CallLogManagerTest extends TelecomTestCase { 
                TEL_PHONEHANDLE, // callHandle

                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits,

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.DIALING, CallState.DISCONNECTED);
@@ -167,6 +169,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.SELECT_PHONE_ACCOUNT,
@@ -189,7 +192,8 @@ public class CallLogManagerTest extends TelecomTestCase { 
                TEL_PHONEHANDLE, // callHandle

                EMERGENCY_ACCT_HANDLE, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits,

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.ACTIVE, CallState.DISCONNECTED);
@@ -210,6 +214,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeOutgoingCall, CallState.ACTIVE,
@@ -233,6 +238,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                null

        );

        mCallLogManager.onCallStateChanged(fakeIncomingCall, CallState.ACTIVE,
@@ -256,6 +262,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                null

        );
@@ -282,6 +289,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.ACTIVE, CallState.DISCONNECTED);
@@ -306,6 +314,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.ACTIVE, CallState.DISCONNECTED);
@@ -328,6 +337,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeCall, CallState.ACTIVE, CallState.DISCONNECTED);
@@ -335,6 +345,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
        assertEquals(insertedValues.getAsString(CallLog.Calls.NUMBER),

                TEL_PHONEHANDLE.getSchemeSpecificPart());

        assertEquals(insertedValues.getAsString(CallLog.Calls.POST_DIAL_DIGITS), POST_DIAL_STRING);

        assertEquals(insertedValues.getAsString(Calls.VIA_NUMBER), VIA_NUMBER_STRING);

    }



    @MediumTest
@@ -351,6 +362,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                BIDIRECTIONAL_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeVideoCall, CallState.ACTIVE, CallState.DISCONNECTED);
@@ -374,6 +386,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeOutgoingCall, CallState.ACTIVE,
@@ -405,6 +418,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                null

        );

        mCallLogManager.onCallStateChanged(fakeIncomingCall, CallState.ACTIVE,
@@ -436,6 +450,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mManagedProfileAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(MANAGED_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeOutgoingCall, CallState.ACTIVE,
@@ -463,6 +478,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mManagedProfileAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(MANAGED_USER_ID)

        );

        mCallLogManager.onCallStateChanged(fakeOutgoingCall, CallState.ACTIVE,
@@ -491,6 +507,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mManagedProfileAccountHandle, // phoneAccountHandle

                NO_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                null

        );

        mCallLogManager.onCallStateChanged(fakeOutgoingCall, CallState.ACTIVE,
@@ -522,6 +539,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                BIDIRECTIONAL_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID), // initiatingUser

                1000 // callDataUsage

        );
@@ -547,6 +565,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
                mDefaultAccountHandle, // phoneAccountHandle

                BIDIRECTIONAL_VIDEO_STATE, // callVideoState

                POST_DIAL_STRING, // postDialDigits

                VIA_NUMBER_STRING, // viaNumber

                UserHandle.of(CURRENT_USER_ID), // initiatingUser

                Call.DATA_USAGE_NOT_SET // callDataUsage

        );
@@ -595,17 +614,17 @@ public class CallLogManagerTest extends TelecomTestCase { 
    private Call makeFakeCall(int disconnectCauseCode, boolean isConference, boolean isIncoming,

            long creationTimeMillis, long ageMillis, Uri callHandle,

            PhoneAccountHandle phoneAccountHandle, int callVideoState,

            String postDialDigits, UserHandle initiatingUser) {

            String postDialDigits, String viaNumber, UserHandle initiatingUser) {

        return makeFakeCall(disconnectCauseCode, isConference, isIncoming, creationTimeMillis,

                ageMillis,

                callHandle, phoneAccountHandle, callVideoState, postDialDigits, initiatingUser,

                Call.DATA_USAGE_NOT_SET);

                ageMillis, callHandle, phoneAccountHandle, callVideoState, postDialDigits,

                viaNumber, initiatingUser, Call.DATA_USAGE_NOT_SET);

    }



    private Call makeFakeCall(int disconnectCauseCode, boolean isConference, boolean isIncoming,

            long creationTimeMillis, long ageMillis, Uri callHandle,

            PhoneAccountHandle phoneAccountHandle, int callVideoState,

            String postDialDigits, UserHandle initiatingUser, long callDataUsage) {

            String postDialDigits, String viaNumber, UserHandle initiatingUser,

            long callDataUsage) {

        Call fakeCall = mock(Call.class);

        when(fakeCall.getDisconnectCause()).thenReturn(

                new DisconnectCause(disconnectCauseCode));
@@ -617,6 +636,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
        when(fakeCall.getTargetPhoneAccount()).thenReturn(phoneAccountHandle);

        when(fakeCall.getVideoStateHistory()).thenReturn(callVideoState);

        when(fakeCall.getPostDialDigits()).thenReturn(postDialDigits);

        when(fakeCall.getViaNumber()).thenReturn(viaNumber);

        when(fakeCall.getInitiatingUser()).thenReturn(initiatingUser);

        when(fakeCall.getCallDataUsage()).thenReturn(callDataUsage);

        return fakeCall;