From 6002b83345c66319a8839912b326a0f84d7a1d9a Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Fri, 23 Aug 2013 17:14:51 -0700
Subject: Adding more public logging to InCallUI

bug: 10461651
Change-Id: Ib79717530911d30478a9c00ad154423f0aca670d
---
 InCallUI/src/com/android/incallui/CallCommandClient.java | 10 ++++++++++
 InCallUI/src/com/android/incallui/InCallPresenter.java   | 15 +++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/CallCommandClient.java b/InCallUI/src/com/android/incallui/CallCommandClient.java
index 621bb2a4f..0cc7a8c2d 100644
--- a/InCallUI/src/com/android/incallui/CallCommandClient.java
+++ b/InCallUI/src/com/android/incallui/CallCommandClient.java
@@ -18,6 +18,7 @@ package com.android.incallui;
 
 import android.os.RemoteException;
 
+import com.android.services.telephony.common.AudioMode;
 import com.android.services.telephony.common.ICallCommandService;
 
 /**
@@ -44,6 +45,7 @@ public class CallCommandClient {
     }
 
     public void answerCall(int callId) {
+        Log.i(this, "answerCall: " + callId);
         if (mCommandService == null) {
             Log.e(this, "Cannot answer call; CallCommandService == null");
             return;
@@ -56,6 +58,7 @@ public class CallCommandClient {
     }
 
     public void rejectCall(int callId, boolean rejectWithMessage, String message) {
+        Log.i(this, "rejectCall: " + callId + ", with rejectMessage? " + rejectWithMessage);
         if (mCommandService == null) {
             Log.e(this, "Cannot reject call; CallCommandService == null");
             return;
@@ -68,6 +71,7 @@ public class CallCommandClient {
     }
 
     public void disconnectCall(int callId) {
+        Log.i(this, "disconnect Call: " + callId);
         if (mCommandService == null) {
             Log.e(this, "Cannot disconnect call; CallCommandService == null");
             return;
@@ -80,6 +84,7 @@ public class CallCommandClient {
     }
 
     public void mute(boolean onOff) {
+        Log.i(this, "mute: " + onOff);
         if (mCommandService == null) {
             Log.e(this, "Cannot mute call; CallCommandService == null");
             return;
@@ -92,6 +97,7 @@ public class CallCommandClient {
     }
 
     public void hold(int callId, boolean onOff) {
+        Log.i(this, "hold call(" + onOff + "): " + callId);
         if (mCommandService == null) {
             Log.e(this, "Cannot hold call; CallCommandService == null");
             return;
@@ -104,6 +110,7 @@ public class CallCommandClient {
     }
 
     public void merge() {
+        Log.i(this, "merge calls");
         if (mCommandService == null) {
             Log.e(this, "Cannot merge call; CallCommandService == null");
             return;
@@ -116,6 +123,7 @@ public class CallCommandClient {
     }
 
     public void swap() {
+        Log.i(this, "swap active/hold calls");
         if (mCommandService == null) {
             Log.e(this, "Cannot swap call; CallCommandService == null");
             return;
@@ -128,6 +136,7 @@ public class CallCommandClient {
     }
 
     public void addCall() {
+        Log.i(this, "add a new call");
         if (mCommandService == null) {
             Log.e(this, "Cannot add call; CallCommandService == null");
             return;
@@ -140,6 +149,7 @@ public class CallCommandClient {
     }
 
     public void setAudioMode(int mode) {
+        Log.i(this, "Set Audio Mode: " + AudioMode.toString(mode));
         if (mCommandService == null) {
             Log.e(this, "Cannot set audio mode; CallCommandService == null");
             return;
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 8df8c168a..8bb0973bf 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -104,13 +104,13 @@ public class InCallPresenter implements CallList.Listener {
         mInCallActivity = inCallActivity;
 
         if (mInCallActivity != null) {
-            Log.d(this, "UI Initialized");
+            Log.i(this, "UI Initialized");
 
             // Since the UI just came up, imitate an update from the call list
             // to set the proper UI state.
             onCallListChange(mCallList);
         } else {
-            Log.d(this, "setActivity(null)");
+            Log.i(this, "UI Destroyed)");
             attemptCleanup();
         }
     }
@@ -127,6 +127,7 @@ public class InCallPresenter implements CallList.Listener {
         newState = startOrFinishUi(newState);
 
         // Set the new state before announcing it to the world
+        Log.i(this, "Phone switching state: " + mInCallState + " -> " + newState);
         mInCallState = newState;
 
         // notify listeners of new state
@@ -264,15 +265,14 @@ public class InCallPresenter implements CallList.Listener {
         // user with a top-level notification.  Just show the call UI normally.
         final boolean showCallUi = (InCallState.OUTGOING == newState);
 
-        Log.v(this, "showCallUi: ", showCallUi);
-        Log.v(this, "startStartupSequence: ", startStartupSequence);
-
-
         if (showCallUi) {
+            Log.i(this, "Start in call UI");
             showInCall();
         } else if (startStartupSequence) {
+            Log.i(this, "Start Full Screen in call UI");
             mStatusBarNotifier.updateNotificationAndLaunchIncomingCallUi(newState, mCallList);
         } else if (newState == InCallState.HIDDEN) {
+            Log.i(this, "Hide in call UI");
 
             // The new state is the hidden state (no calls).  Tear everything down.
             if (mInCallActivity != null) {
@@ -297,7 +297,7 @@ public class InCallPresenter implements CallList.Listener {
      */
     private void attemptCleanup() {
         if (mInCallActivity == null && !mServiceConnected) {
-            Log.d(this, "Start InCallPresenter.CleanUp");
+            Log.i(this, "Start InCall presenter cleanup.");
             mProximitySensor = null;
 
             mAudioModeProvider = null;
@@ -318,7 +318,6 @@ public class InCallPresenter implements CallList.Listener {
     }
 
     private void showInCall() {
-        Log.d(this, "Showing in call manually.");
         mContext.startActivity(getInCallIntent());
     }
 
-- 
cgit v1.2.3