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

Commit 8f98f10d authored by Brad Ebinger's avatar Brad Ebinger
Browse files

resolve merge conflicts of 953e1af6 to stage-aosp-master 

Test: Manual Testing
Change-Id: I3c8cac2c8b3634db7a20cceda434e6db6cdb05ca
parents a8bfe8fb 953e1af6

proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
-keep class com.android.server.telecom.TelecomSystem {

  *;

}

-keep class com.android.server.telecom.Log {

-keep class android.telecom.Log {

  *;

}

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

+73 −71
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package com.android.server.telecom; 


import android.telecom.Connection;

import android.telecom.DisconnectCause;

import android.telecom.Logging.EventManager;

import android.telecom.ParcelableCallAnalytics;

import android.telecom.TelecomAnalytics;

import android.util.Base64;

import android.telecom.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;
@@ -48,92 +50,92 @@ public class Analytics { 


    public static final Map<String, Integer> sLogEventToAnalyticsEvent =

            new HashMap<String, Integer>() {{

                put(Log.Events.SET_SELECT_PHONE_ACCOUNT, AnalyticsEvent.SET_SELECT_PHONE_ACCOUNT);

                put(Log.Events.REQUEST_HOLD, AnalyticsEvent.REQUEST_HOLD);

                put(Log.Events.REQUEST_UNHOLD, AnalyticsEvent.REQUEST_UNHOLD);

                put(Log.Events.SWAP, AnalyticsEvent.SWAP);

                put(Log.Events.SKIP_RINGING, AnalyticsEvent.SKIP_RINGING);

                put(Log.Events.CONFERENCE_WITH, AnalyticsEvent.CONFERENCE_WITH);

                put(Log.Events.SPLIT_FROM_CONFERENCE, AnalyticsEvent.SPLIT_CONFERENCE);

                put(Log.Events.SET_PARENT, AnalyticsEvent.SET_PARENT);

                put(Log.Events.MUTE, AnalyticsEvent.MUTE);

                put(Log.Events.UNMUTE, AnalyticsEvent.UNMUTE);

                put(Log.Events.AUDIO_ROUTE_BT, AnalyticsEvent.AUDIO_ROUTE_BT);

                put(Log.Events.AUDIO_ROUTE_EARPIECE, AnalyticsEvent.AUDIO_ROUTE_EARPIECE);

                put(Log.Events.AUDIO_ROUTE_HEADSET, AnalyticsEvent.AUDIO_ROUTE_HEADSET);

                put(Log.Events.AUDIO_ROUTE_SPEAKER, AnalyticsEvent.AUDIO_ROUTE_SPEAKER);

                put(Log.Events.SILENCE, AnalyticsEvent.SILENCE);

                put(Log.Events.SCREENING_COMPLETED, AnalyticsEvent.SCREENING_COMPLETED);

                put(Log.Events.BLOCK_CHECK_FINISHED, AnalyticsEvent.BLOCK_CHECK_FINISHED);

                put(Log.Events.DIRECT_TO_VM_FINISHED, AnalyticsEvent.DIRECT_TO_VM_FINISHED);

                put(Log.Events.REMOTELY_HELD, AnalyticsEvent.REMOTELY_HELD);

                put(Log.Events.REMOTELY_UNHELD, AnalyticsEvent.REMOTELY_UNHELD);

                put(Log.Events.REQUEST_PULL, AnalyticsEvent.REQUEST_PULL);

                put(Log.Events.REQUEST_ACCEPT, AnalyticsEvent.REQUEST_ACCEPT);

                put(Log.Events.REQUEST_REJECT, AnalyticsEvent.REQUEST_REJECT);

                put(Log.Events.SET_ACTIVE, AnalyticsEvent.SET_ACTIVE);

                put(Log.Events.SET_DISCONNECTED, AnalyticsEvent.SET_DISCONNECTED);

                put(Log.Events.SET_HOLD, AnalyticsEvent.SET_HOLD);

                put(Log.Events.SET_DIALING, AnalyticsEvent.SET_DIALING);

                put(Log.Events.START_CONNECTION, AnalyticsEvent.START_CONNECTION);

                put(Log.Events.BIND_CS, AnalyticsEvent.BIND_CS);

                put(Log.Events.CS_BOUND, AnalyticsEvent.CS_BOUND);

                put(Log.Events.SCREENING_SENT, AnalyticsEvent.SCREENING_SENT);

                put(Log.Events.DIRECT_TO_VM_INITIATED, AnalyticsEvent.DIRECT_TO_VM_INITIATED);

                put(Log.Events.BLOCK_CHECK_INITIATED, AnalyticsEvent.BLOCK_CHECK_INITIATED);

                put(Log.Events.FILTERING_INITIATED, AnalyticsEvent.FILTERING_INITIATED);

                put(Log.Events.FILTERING_COMPLETED, AnalyticsEvent.FILTERING_COMPLETED);

                put(Log.Events.FILTERING_TIMED_OUT, AnalyticsEvent.FILTERING_TIMED_OUT);

                put(LogUtils.Events.SET_SELECT_PHONE_ACCOUNT, AnalyticsEvent.SET_SELECT_PHONE_ACCOUNT);

                put(LogUtils.Events.REQUEST_HOLD, AnalyticsEvent.REQUEST_HOLD);

                put(LogUtils.Events.REQUEST_UNHOLD, AnalyticsEvent.REQUEST_UNHOLD);

                put(LogUtils.Events.SWAP, AnalyticsEvent.SWAP);

                put(LogUtils.Events.SKIP_RINGING, AnalyticsEvent.SKIP_RINGING);

                put(LogUtils.Events.CONFERENCE_WITH, AnalyticsEvent.CONFERENCE_WITH);

                put(LogUtils.Events.SPLIT_FROM_CONFERENCE, AnalyticsEvent.SPLIT_CONFERENCE);

                put(LogUtils.Events.SET_PARENT, AnalyticsEvent.SET_PARENT);

                put(LogUtils.Events.MUTE, AnalyticsEvent.MUTE);

                put(LogUtils.Events.UNMUTE, AnalyticsEvent.UNMUTE);

                put(LogUtils.Events.AUDIO_ROUTE_BT, AnalyticsEvent.AUDIO_ROUTE_BT);

                put(LogUtils.Events.AUDIO_ROUTE_EARPIECE, AnalyticsEvent.AUDIO_ROUTE_EARPIECE);

                put(LogUtils.Events.AUDIO_ROUTE_HEADSET, AnalyticsEvent.AUDIO_ROUTE_HEADSET);

                put(LogUtils.Events.AUDIO_ROUTE_SPEAKER, AnalyticsEvent.AUDIO_ROUTE_SPEAKER);

                put(LogUtils.Events.SILENCE, AnalyticsEvent.SILENCE);

                put(LogUtils.Events.SCREENING_COMPLETED, AnalyticsEvent.SCREENING_COMPLETED);

                put(LogUtils.Events.BLOCK_CHECK_FINISHED, AnalyticsEvent.BLOCK_CHECK_FINISHED);

                put(LogUtils.Events.DIRECT_TO_VM_FINISHED, AnalyticsEvent.DIRECT_TO_VM_FINISHED);

                put(LogUtils.Events.REMOTELY_HELD, AnalyticsEvent.REMOTELY_HELD);

                put(LogUtils.Events.REMOTELY_UNHELD, AnalyticsEvent.REMOTELY_UNHELD);

                put(LogUtils.Events.REQUEST_PULL, AnalyticsEvent.REQUEST_PULL);

                put(LogUtils.Events.REQUEST_ACCEPT, AnalyticsEvent.REQUEST_ACCEPT);

                put(LogUtils.Events.REQUEST_REJECT, AnalyticsEvent.REQUEST_REJECT);

                put(LogUtils.Events.SET_ACTIVE, AnalyticsEvent.SET_ACTIVE);

                put(LogUtils.Events.SET_DISCONNECTED, AnalyticsEvent.SET_DISCONNECTED);

                put(LogUtils.Events.SET_HOLD, AnalyticsEvent.SET_HOLD);

                put(LogUtils.Events.SET_DIALING, AnalyticsEvent.SET_DIALING);

                put(LogUtils.Events.START_CONNECTION, AnalyticsEvent.START_CONNECTION);

                put(LogUtils.Events.BIND_CS, AnalyticsEvent.BIND_CS);

                put(LogUtils.Events.CS_BOUND, AnalyticsEvent.CS_BOUND);

                put(LogUtils.Events.SCREENING_SENT, AnalyticsEvent.SCREENING_SENT);

                put(LogUtils.Events.DIRECT_TO_VM_INITIATED, AnalyticsEvent.DIRECT_TO_VM_INITIATED);

                put(LogUtils.Events.BLOCK_CHECK_INITIATED, AnalyticsEvent.BLOCK_CHECK_INITIATED);

                put(LogUtils.Events.FILTERING_INITIATED, AnalyticsEvent.FILTERING_INITIATED);

                put(LogUtils.Events.FILTERING_COMPLETED, AnalyticsEvent.FILTERING_COMPLETED);

                put(LogUtils.Events.FILTERING_TIMED_OUT, AnalyticsEvent.FILTERING_TIMED_OUT);

            }};



    public static final Map<String, Integer> sLogSessionToSessionId =

            new HashMap<String, Integer> () {{

                put(Log.Sessions.ICA_ANSWER_CALL, SessionTiming.ICA_ANSWER_CALL);

                put(Log.Sessions.ICA_REJECT_CALL, SessionTiming.ICA_REJECT_CALL);

                put(Log.Sessions.ICA_DISCONNECT_CALL, SessionTiming.ICA_DISCONNECT_CALL);

                put(Log.Sessions.ICA_HOLD_CALL, SessionTiming.ICA_HOLD_CALL);

                put(Log.Sessions.ICA_UNHOLD_CALL, SessionTiming.ICA_UNHOLD_CALL);

                put(Log.Sessions.ICA_MUTE, SessionTiming.ICA_MUTE);

                put(Log.Sessions.ICA_SET_AUDIO_ROUTE, SessionTiming.ICA_SET_AUDIO_ROUTE);

                put(Log.Sessions.ICA_CONFERENCE, SessionTiming.ICA_CONFERENCE);

                put(Log.Sessions.CSW_HANDLE_CREATE_CONNECTION_COMPLETE,

                put(LogUtils.Sessions.ICA_ANSWER_CALL, SessionTiming.ICA_ANSWER_CALL);

                put(LogUtils.Sessions.ICA_REJECT_CALL, SessionTiming.ICA_REJECT_CALL);

                put(LogUtils.Sessions.ICA_DISCONNECT_CALL, SessionTiming.ICA_DISCONNECT_CALL);

                put(LogUtils.Sessions.ICA_HOLD_CALL, SessionTiming.ICA_HOLD_CALL);

                put(LogUtils.Sessions.ICA_UNHOLD_CALL, SessionTiming.ICA_UNHOLD_CALL);

                put(LogUtils.Sessions.ICA_MUTE, SessionTiming.ICA_MUTE);

                put(LogUtils.Sessions.ICA_SET_AUDIO_ROUTE, SessionTiming.ICA_SET_AUDIO_ROUTE);

                put(LogUtils.Sessions.ICA_CONFERENCE, SessionTiming.ICA_CONFERENCE);

                put(LogUtils.Sessions.CSW_HANDLE_CREATE_CONNECTION_COMPLETE,

                        SessionTiming.CSW_HANDLE_CREATE_CONNECTION_COMPLETE);

                put(Log.Sessions.CSW_SET_ACTIVE, SessionTiming.CSW_SET_ACTIVE);

                put(Log.Sessions.CSW_SET_RINGING, SessionTiming.CSW_SET_RINGING);

                put(Log.Sessions.CSW_SET_DIALING, SessionTiming.CSW_SET_DIALING);

                put(Log.Sessions.CSW_SET_DISCONNECTED, SessionTiming.CSW_SET_DISCONNECTED);

                put(Log.Sessions.CSW_SET_ON_HOLD, SessionTiming.CSW_SET_ON_HOLD);

                put(Log.Sessions.CSW_REMOVE_CALL, SessionTiming.CSW_REMOVE_CALL);

                put(Log.Sessions.CSW_SET_IS_CONFERENCED, SessionTiming.CSW_SET_IS_CONFERENCED);

                put(Log.Sessions.CSW_ADD_CONFERENCE_CALL, SessionTiming.CSW_ADD_CONFERENCE_CALL);

                put(LogUtils.Sessions.CSW_SET_ACTIVE, SessionTiming.CSW_SET_ACTIVE);

                put(LogUtils.Sessions.CSW_SET_RINGING, SessionTiming.CSW_SET_RINGING);

                put(LogUtils.Sessions.CSW_SET_DIALING, SessionTiming.CSW_SET_DIALING);

                put(LogUtils.Sessions.CSW_SET_DISCONNECTED, SessionTiming.CSW_SET_DISCONNECTED);

                put(LogUtils.Sessions.CSW_SET_ON_HOLD, SessionTiming.CSW_SET_ON_HOLD);

                put(LogUtils.Sessions.CSW_REMOVE_CALL, SessionTiming.CSW_REMOVE_CALL);

                put(LogUtils.Sessions.CSW_SET_IS_CONFERENCED, SessionTiming.CSW_SET_IS_CONFERENCED);

                put(LogUtils.Sessions.CSW_ADD_CONFERENCE_CALL, SessionTiming.CSW_ADD_CONFERENCE_CALL);



            }};



    public static final Map<String, Integer> sLogEventTimingToAnalyticsEventTiming =

            new HashMap<String, Integer>() {{

                put(Log.Events.Timings.ACCEPT_TIMING,

                put(LogUtils.Events.Timings.ACCEPT_TIMING,

                        ParcelableCallAnalytics.EventTiming.ACCEPT_TIMING);

                put(Log.Events.Timings.REJECT_TIMING,

                put(LogUtils.Events.Timings.REJECT_TIMING,

                        ParcelableCallAnalytics.EventTiming.REJECT_TIMING);

                put(Log.Events.Timings.DISCONNECT_TIMING,

                put(LogUtils.Events.Timings.DISCONNECT_TIMING,

                        ParcelableCallAnalytics.EventTiming.DISCONNECT_TIMING);

                put(Log.Events.Timings.HOLD_TIMING,

                put(LogUtils.Events.Timings.HOLD_TIMING,

                        ParcelableCallAnalytics.EventTiming.HOLD_TIMING);

                put(Log.Events.Timings.UNHOLD_TIMING,

                put(LogUtils.Events.Timings.UNHOLD_TIMING,

                        ParcelableCallAnalytics.EventTiming.UNHOLD_TIMING);

                put(Log.Events.Timings.OUTGOING_TIME_TO_DIALING_TIMING,

                put(LogUtils.Events.Timings.OUTGOING_TIME_TO_DIALING_TIMING,

                        ParcelableCallAnalytics.EventTiming.OUTGOING_TIME_TO_DIALING_TIMING);

                put(Log.Events.Timings.BIND_CS_TIMING,

                put(LogUtils.Events.Timings.BIND_CS_TIMING,

                        ParcelableCallAnalytics.EventTiming.BIND_CS_TIMING);

                put(Log.Events.Timings.SCREENING_COMPLETED_TIMING,

                put(LogUtils.Events.Timings.SCREENING_COMPLETED_TIMING,

                        ParcelableCallAnalytics.EventTiming.SCREENING_COMPLETED_TIMING);

                put(Log.Events.Timings.DIRECT_TO_VM_FINISHED_TIMING,

                put(LogUtils.Events.Timings.DIRECT_TO_VM_FINISHED_TIMING,

                        ParcelableCallAnalytics.EventTiming.DIRECT_TO_VM_FINISHED_TIMING);

                put(Log.Events.Timings.BLOCK_CHECK_FINISHED_TIMING,

                put(LogUtils.Events.Timings.BLOCK_CHECK_FINISHED_TIMING,

                        ParcelableCallAnalytics.EventTiming.BLOCK_CHECK_FINISHED_TIMING);

                put(Log.Events.Timings.FILTERING_COMPLETED_TIMING,

                put(LogUtils.Events.Timings.FILTERING_COMPLETED_TIMING,

                        ParcelableCallAnalytics.EventTiming.FILTERING_COMPLETED_TIMING);

                put(Log.Events.Timings.FILTERING_TIMED_OUT_TIMING,

                put(LogUtils.Events.Timings.FILTERING_TIMED_OUT_TIMING,

                        ParcelableCallAnalytics.EventTiming.FILTERING_TIMED_OUT_TIMING);

            }};
@@ -169,7 +171,7 @@ public class Analytics { 
        public void setCallConnectionService(String connectionServiceName) {

        }



        public void setCallEvents(Log.CallEventRecord records) {

        public void setCallEvents(EventManager.EventRecord records) {

        }



        public void setCallIsVideo(boolean isVideo) {
@@ -210,7 +212,7 @@ public class Analytics { 
        public String connectionService;

        public boolean isEmergency = false;



        public Log.CallEventRecord callEvents;

        public EventManager.EventRecord callEvents;



        public boolean isVideo = false;

        public List<TelecomLogClass.VideoEvent> videoEvents;
@@ -309,7 +311,7 @@ public class Analytics { 
        }



        @Override

        public void setCallEvents(Log.CallEventRecord records) {

        public void setCallEvents(EventManager.EventRecord records) {

            this.callEvents = records;

        }
@@ -638,10 +640,10 @@ public class Analytics { 
    }



    private static TelecomLogClass.Event[] convertLogEventsToProtoEvents(

            List<Log.CallEvent> logEvents) {

            List<EventManager.Event> logEvents) {

        long timeOfLastEvent = -1;

        ArrayList<TelecomLogClass.Event> events = new ArrayList<>(logEvents.size());

        for (Log.CallEvent logEvent : logEvents) {

        for (EventManager.Event logEvent : logEvents) {

            if (sLogEventToAnalyticsEvent.containsKey(logEvent.eventId)) {

                TelecomLogClass.Event event = new TelecomLogClass.Event();

                event.setEventName(sLogEventToAnalyticsEvent.get(logEvent.eventId));
@@ -655,7 +657,7 @@ public class Analytics { 
    }



    private static TelecomLogClass.EventTimingEntry logEventTimingToProtoEventTiming(

            Log.CallEventRecord.EventTiming logEventTiming) {

            EventManager.EventRecord.EventTiming logEventTiming) {

        int analyticsEventTimingName =

                sLogEventTimingToAnalyticsEventTiming.containsKey(logEventTiming.name) ?

                        sLogEventTimingToAnalyticsEventTiming.get(logEventTiming.name) :

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

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.net.Uri; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

import android.telecom.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.SomeArgs;
@@ -137,8 +138,8 @@ public class AsyncRingtonePlayer { 
                Uri ringtoneUri = incomingCall.getRingtone();

                String ringtoneUriString = (ringtoneUri == null) ? "null" :

                        ringtoneUri.toSafeString();

                Log.event(null, Log.Events.ERROR_LOG, "Failed to get ringtone from factory. " +

                        "Skipping ringing. Uri was: " + ringtoneUriString);

                Log.addEvent(null, LogUtils.Events.ERROR_LOG, "Failed to get ringtone from " +

                        "factory. Skipping ringing. Uri was: " + ringtoneUriString);

                return;

            }

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.content.IntentFilter; 
import android.os.Handler;

import android.os.Looper;

import android.os.SystemClock;

import android.telecom.Log;

import android.telecom.Logging.Runnable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.RemoteException;

import android.telecom.Connection;

import android.telecom.Log;

import android.telecom.PhoneAccount;

import android.telecom.VideoProfile;

import android.telephony.PhoneNumberUtils;