Merge "Transplant Logging to android.telecom" am: 6817ba9be2
am: e0a9727add
Change-Id: I29d41bc5ae4f6739301d0966c791830a35fc6f60
diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/server/telecom/LogUtils.java
new file mode 100644
index 0000000..405e502
--- /dev/null
+++ b/src/com/android/server/telecom/LogUtils.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.server.telecom;
+
+import android.telecom.Logging.EventManager;
+import android.telecom.Logging.EventManager.TimedEventPair;
+
+/**
+ * Temporary location of new Logging class
+ */
+
+public class LogUtils {
+
+ private static final String TAG = "Telecom";
+
+ public static final class Sessions {
+ public static final String ICA_ANSWER_CALL = "ICA.aC";
+ public static final String ICA_REJECT_CALL = "ICA.rC";
+ public static final String ICA_DISCONNECT_CALL = "ICA.dC";
+ public static final String ICA_HOLD_CALL = "ICA.hC";
+ public static final String ICA_UNHOLD_CALL = "ICA.uC";
+ public static final String ICA_MUTE = "ICA.m";
+ public static final String ICA_SET_AUDIO_ROUTE = "ICA.sAR";
+ public static final String ICA_CONFERENCE = "ICA.c";
+ public static final String CSW_HANDLE_CREATE_CONNECTION_COMPLETE = "CSW.hCCC";
+ public static final String CSW_SET_ACTIVE = "CSW.sA";
+ public static final String CSW_SET_RINGING = "CSW.sR";
+ public static final String CSW_SET_DIALING = "CSW.sD";
+ public static final String CSW_SET_PULLING = "CSW.sP";
+ public static final String CSW_SET_DISCONNECTED = "CSW.sDc";
+ public static final String CSW_SET_ON_HOLD = "CSW.sOH";
+ public static final String CSW_REMOVE_CALL = "CSW.rC";
+ public static final String CSW_SET_IS_CONFERENCED = "CSW.sIC";
+ public static final String CSW_ADD_CONFERENCE_CALL = "CSW.aCC";
+ }
+
+ public final static class Events {
+ public static final String CREATED = "CREATED";
+ public static final String DESTROYED = "DESTROYED";
+ public static final String SET_CONNECTING = "SET_CONNECTING";
+ public static final String SET_DIALING = "SET_DIALING";
+ public static final String SET_PULLING = "SET_PULLING";
+ public static final String SET_ACTIVE = "SET_ACTIVE";
+ public static final String SET_HOLD = "SET_HOLD";
+ public static final String SET_RINGING = "SET_RINGING";
+ public static final String SET_DISCONNECTED = "SET_DISCONNECTED";
+ public static final String SET_DISCONNECTING = "SET_DISCONNECTING";
+ public static final String SET_SELECT_PHONE_ACCOUNT = "SET_SELECT_PHONE_ACCOUNT";
+ public static final String REQUEST_HOLD = "REQUEST_HOLD";
+ public static final String REQUEST_UNHOLD = "REQUEST_UNHOLD";
+ public static final String REQUEST_DISCONNECT = "REQUEST_DISCONNECT";
+ public static final String REQUEST_ACCEPT = "REQUEST_ACCEPT";
+ public static final String REQUEST_REJECT = "REQUEST_REJECT";
+ public static final String START_DTMF = "START_DTMF";
+ public static final String STOP_DTMF = "STOP_DTMF";
+ public static final String START_RINGER = "START_RINGER";
+ public static final String STOP_RINGER = "STOP_RINGER";
+ public static final String SKIP_RINGING = "SKIP_RINGING";
+ public static final String START_CALL_WAITING_TONE = "START_CALL_WAITING_TONE";
+ public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE";
+ public static final String START_CONNECTION = "START_CONNECTION";
+ public static final String BIND_CS = "BIND_CS";
+ public static final String CS_BOUND = "CS_BOUND";
+ public static final String CONFERENCE_WITH = "CONF_WITH";
+ public static final String SPLIT_FROM_CONFERENCE = "CONF_SPLIT";
+ public static final String SWAP = "SWAP";
+ public static final String ADD_CHILD = "ADD_CHILD";
+ public static final String REMOVE_CHILD = "REMOVE_CHILD";
+ public static final String SET_PARENT = "SET_PARENT";
+ public static final String MUTE = "MUTE";
+ public static final String UNMUTE = "UNMUTE";
+ public static final String AUDIO_ROUTE = "AUDIO_ROUTE";
+ public static final String AUDIO_ROUTE_EARPIECE = "AUDIO_ROUTE_EARPIECE";
+ public static final String AUDIO_ROUTE_HEADSET = "AUDIO_ROUTE_HEADSET";
+ public static final String AUDIO_ROUTE_BT = "AUDIO_ROUTE_BT";
+ public static final String AUDIO_ROUTE_SPEAKER = "AUDIO_ROUTE_SPEAKER";
+ public static final String ERROR_LOG = "ERROR";
+ public static final String USER_LOG_MARK = "USER_LOG_MARK";
+ public static final String SILENCE = "SILENCE";
+ public static final String BIND_SCREENING = "BIND_SCREENING";
+ public static final String SCREENING_BOUND = "SCREENING_BOUND";
+ public static final String SCREENING_SENT = "SCREENING_SENT";
+ public static final String SCREENING_COMPLETED = "SCREENING_COMPLETED";
+ public static final String BLOCK_CHECK_INITIATED = "BLOCK_CHECK_INITIATED";
+ public static final String BLOCK_CHECK_FINISHED = "BLOCK_CHECK_FINISHED";
+ public static final String DIRECT_TO_VM_INITIATED = "DIRECT_TO_VM_INITIATED";
+ public static final String DIRECT_TO_VM_FINISHED = "DIRECT_TO_VM_FINISHED";
+ public static final String FILTERING_INITIATED = "FILTERING_INITIATED";
+ public static final String FILTERING_COMPLETED = "FILTERING_COMPLETED";
+ public static final String FILTERING_TIMED_OUT = "FILTERING_TIMED_OUT";
+ public static final String REMOTELY_HELD = "REMOTELY_HELD";
+ public static final String REMOTELY_UNHELD = "REMOTELY_UNHELD";
+ public static final String REQUEST_PULL = "PULL";
+ public static final String INFO = "INFO";
+ public static final String VIDEO_STATE_CHANGED = "VIDEO_STATE_CHANGED";
+ public static final String RECEIVE_VIDEO_REQUEST = "RECEIVE_VIDEO_REQUEST";
+ public static final String RECEIVE_VIDEO_RESPONSE = "RECEIVE_VIDEO_RESPONSE";
+ public static final String SEND_VIDEO_REQUEST = "SEND_VIDEO_REQUEST";
+ public static final String SEND_VIDEO_RESPONSE = "SEND_VIDEO_RESPONSE";
+ public static final String IS_EXTERNAL = "IS_EXTERNAL";
+ public static final String PROPERTY_CHANGE = "PROPERTY_CHANGE";
+ public static final String CAPABILITY_CHANGE = "CAPABILITY_CHANGE";
+ public static final String CONNECTION_EVENT = "CONNECTION_EVENT";
+
+ public static class Timings {
+ public static final String ACCEPT_TIMING = "accept";
+ public static final String REJECT_TIMING = "reject";
+ public static final String DISCONNECT_TIMING = "disconnect";
+ public static final String HOLD_TIMING = "hold";
+ public static final String UNHOLD_TIMING = "unhold";
+ public static final String OUTGOING_TIME_TO_DIALING_TIMING = "outgoing_time_to_dialing";
+ public static final String BIND_CS_TIMING = "bind_cs";
+ public static final String SCREENING_COMPLETED_TIMING = "screening_completed";
+ public static final String DIRECT_TO_VM_FINISHED_TIMING = "direct_to_vm_finished";
+ public static final String BLOCK_CHECK_FINISHED_TIMING = "block_check_finished";
+ public static final String FILTERING_COMPLETED_TIMING = "filtering_completed";
+ public static final String FILTERING_TIMED_OUT_TIMING = "filtering_timed_out";
+
+ private static final TimedEventPair[] sTimedEvents = {
+ new TimedEventPair(REQUEST_ACCEPT, SET_ACTIVE, ACCEPT_TIMING),
+ new TimedEventPair(REQUEST_REJECT, SET_DISCONNECTED, REJECT_TIMING),
+ new TimedEventPair(REQUEST_DISCONNECT, SET_DISCONNECTED, DISCONNECT_TIMING),
+ new TimedEventPair(REQUEST_HOLD, SET_HOLD, HOLD_TIMING),
+ new TimedEventPair(REQUEST_UNHOLD, SET_ACTIVE, UNHOLD_TIMING),
+ new TimedEventPair(START_CONNECTION, SET_DIALING,
+ OUTGOING_TIME_TO_DIALING_TIMING),
+ new TimedEventPair(BIND_CS, CS_BOUND, BIND_CS_TIMING),
+ new TimedEventPair(SCREENING_SENT, SCREENING_COMPLETED,
+ SCREENING_COMPLETED_TIMING),
+ new TimedEventPair(DIRECT_TO_VM_INITIATED, DIRECT_TO_VM_FINISHED,
+ DIRECT_TO_VM_FINISHED_TIMING),
+ new TimedEventPair(BLOCK_CHECK_INITIATED, BLOCK_CHECK_FINISHED,
+ BLOCK_CHECK_FINISHED_TIMING),
+ new TimedEventPair(FILTERING_INITIATED, FILTERING_COMPLETED,
+ FILTERING_COMPLETED_TIMING),
+ new TimedEventPair(FILTERING_INITIATED, FILTERING_TIMED_OUT,
+ FILTERING_TIMED_OUT_TIMING, 6000L),
+ };
+ }
+ }
+
+ static {
+ initLogging();
+ }
+
+ private static void initLogging() {
+ android.telecom.Log.setTag(TAG);
+ for (EventManager.TimedEventPair p : Events.Timings.sTimedEvents) {
+ android.telecom.Log.addRequestResponsePair(p);
+ }
+ }
+}