commit 12fad9b3a124fd02cbb3e0c2d49e2015803aaebc
author Santos Cordon <santoscordon@google.com> Tue Oct 08 19:08:21 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 08 19:08:22 2013 +0000
tree 61d3ff46e599d78b51b42aad6d47a155cf5899c6
parent 3aca5f48d14b52b351fbe7ec89f4b8fc14673628
parent fa38c366467b7278825b21dbeba4a92106d52af9

Merge "Add logging to dialer." into klp-dev

InCallUI/src/com/android/incallui/InCallApp.java

diff --git a/InCallUI/src/com/android/incallui/InCallApp.java b/InCallUI/src/com/android/incallui/InCallApp.java
index 6708bb4..dcc7848 100644
--- a/InCallUI/src/com/android/incallui/InCallApp.java
+++ b/InCallUI/src/com/android/incallui/InCallApp.java
@@ -57,7 +57,7 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
-            Log.v(this, "Broadcast from Notification: ", action);
+            Log.i(this, "Broadcast from Notification: " + action);
 
             if (action.equals(ACTION_HANG_UP_ONGOING_CALL)) {
                 // TODO: Commands of this nature should exist in the CallList or a

InCallUI/src/com/android/incallui/ProximitySensor.java

diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java
index 2210a38..0da68ef 100644
--- a/InCallUI/src/com/android/incallui/ProximitySensor.java
+++ b/InCallUI/src/com/android/incallui/ProximitySensor.java
@@ -216,8 +216,9 @@
                         .add("keybrd", mIsHardKeyboardOpen ? 1 : 0)
                         .add("dpad", mDialpadVisible ? 1 : 0)
                         .add("offhook", mIsPhoneOffhook ? 1 : 0)
-                        .add("aud", audioMode)
-                        .add("hor", horizontal ? 1 : 0).toString());
+                        .add("hor", horizontal ? 1 : 0)
+                        .add("ui", mUiShowing ? 1 : 0)
+                        .add("aud", AudioMode.toString(audioMode)).toString());
 
                 if (mIsPhoneOffhook && !screenOnImmediately) {
                     final String logStr = "turning on proximity sensor: ";