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

Commit a2dfbf36 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Removed unused PII from TelephonyEventLog" into nyc-mr1-dev

parents 6b3969d1 c3ec7d48

src/java/com/android/internal/telephony/TelephonyEventLog.java

+4 −10
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ public class TelephonyEventLog extends ConnectivityMetricsLogger { 
    public static final String DATA_KEY_SMS_MESSAGE_REF = "messageRef";

    public static final String DATA_KEY_SMS_ACK_PDU = "ackPDU";

    public static final String DATA_KEY_SMS_ERROR_CODE = "errorCode";

    public static final String DATA_KEY_CALLEE = "callee";

    public static final String DATA_KEY_PARTICIPANTS = "participants";

    public static final String DATA_KEY_SRC_TECH = "src-tech";

    public static final String DATA_KEY_TARGET_TECH = "target-tech";
@@ -508,16 +506,12 @@ public class TelephonyEventLog extends ConnectivityMetricsLogger { 
        return null;

    }



    public void writeOnImsCallStart(ImsCallSession session, String callee) {

        Bundle b = new Bundle();

        b.putString(DATA_KEY_CALLEE, callee);

        writeEvent(TAG_IMS_CALL_START, getCallId(session), -1, b);

    public void writeOnImsCallStart(ImsCallSession session) {

        writeEvent(TAG_IMS_CALL_START, getCallId(session), -1, null);

    }



    public void writeOnImsCallStartConference(ImsCallSession session, String[] participants) {

        Bundle b = new Bundle();

        b.putStringArray(DATA_KEY_PARTICIPANTS, participants);

        writeEvent(TAG_IMS_CALL_START_CONFERENCE, getCallId(session), -1, b);

    public void writeOnImsCallStartConference(ImsCallSession session) {

        writeEvent(TAG_IMS_CALL_START_CONFERENCE, getCallId(session), -1, null);

    }



    public void writeOnImsCallReceive(ImsCallSession session) {

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    callees, mImsCallListener);

            conn.setImsCall(imsCall);



            mEventLog.writeOnImsCallStart(imsCall.getSession(), callees[0]);

            mEventLog.writeOnImsCallStart(imsCall.getSession());



            setVideoCallProvider(conn, imsCall);

            conn.setAllowAddCallDuringVideoCall(mAllowAddCallDuringVideoCall);