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

Commit a644173c authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Hook up emergency metrics" 

am: b1b1c64f

Change-Id: Ic924705b26c26b053b9692abd034175d40d90b64
parents 4387d74e b1b1c64f

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

+10 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ public class Analytics { 
        public void setCallIsAdditional(boolean isAdditional) {

        }



        public void setCallIsEmergency(boolean isEmergency) {

        }



        public void setCallIsInterrupted(boolean isInterrupted) {

        }
@@ -294,6 +297,12 @@ public class Analytics { 
            this.callTechnologies |= callTechnology;

        }



        @Override

        public void setCallIsEmergency(boolean isEmergency) {

            Log.d(TAG, "setting call as emergency: " + isEmergency);

            this.isEmergency = isEmergency;

        }



        @Override

        public void setCallDisconnectCause(DisconnectCause disconnectCause) {

            Log.d(TAG, "setting disconnectCause for call " + callId + " to " + disconnectCause);
@@ -361,6 +370,7 @@ public class Analytics { 
                    + "    direction: " + getCallDirectionString() + '\n'

                    + "    isAdditionalCall: " + isAdditionalCall + '\n'

                    + "    isInterrupted: " + isInterrupted + '\n'

                    + "    isEmergency: " + isEmergency + '\n'

                    + "    callTechnologies: " + getCallTechnologiesAsString() + '\n'

                    + "    callTerminationReason: " + getCallDisconnectReasonString() + '\n'

                    + "    connectionService: " + connectionService + '\n'

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

+3 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
    private final TelecomSystem.SyncRoot mLock;

    private final String mId;

    private String mConnectionId;

    private Analytics.CallInfo mAnalytics;

    private Analytics.CallInfo mAnalytics = new Analytics.CallInfo();

    private char mPlayingDtmfTone;



    private boolean mWasConferencePreviouslyMerged = false;
@@ -580,7 +580,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        mShouldAttachToExistingConnection = shouldAttachToExistingConnection

                || callDirection == CALL_DIRECTION_INCOMING;

        maybeLoadCannedSmsResponses();

        mAnalytics = new Analytics.CallInfo();

        mClockProxy = clockProxy;

        mCreationTimeMillis = mClockProxy.currentTimeMillis();

    }
@@ -657,6 +656,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                analyticsDirection = Analytics.UNKNOWN_DIRECTION;

        }

        mAnalytics = Analytics.initiateCallAnalytics(mId, analyticsDirection);

        mAnalytics.setCallIsEmergency(mIsEmergencyCall);

        Log.addEvent(this, LogUtils.Events.CREATED);

    }
@@ -1033,6 +1033,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                mIsEmergencyCall = mHandle != null &&

                        mPhoneNumberUtilsAdapter.isLocalEmergencyNumber(mContext,

                                mHandle.getSchemeSpecificPart());

                mAnalytics.setCallIsEmergency(mIsEmergencyCall);

            }

            startCallerInfoLookup();

            for (Listener l : mListeners) {