commit b2977fed4b05449d3ee70023090ae5c06f317029
author Santos Cordon <santoscordon@google.com> Wed May 28 18:33:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 28 18:33:55 2014 +0000
tree e5fe12f60527732bfff42a384d1a954886d3ab40
parent 600c8201e31219e77d542183b87844fcbc5b18a8
parent 833a6d9f594dd25dca59af2a3e83db927680f113

am 833a6d9f: Merge "Fix log errors and hide PII statically." into lmp-preview-dev

* commit '833a6d9f594dd25dca59af2a3e83db927680f113':
  Fix log errors and hide PII statically.

src/com/android/telecomm/CallServiceWrapper.java

diff --git a/src/com/android/telecomm/CallServiceWrapper.java b/src/com/android/telecomm/CallServiceWrapper.java
index 4040e33..9b96890 100644
--- a/src/com/android/telecomm/CallServiceWrapper.java
+++ b/src/com/android/telecomm/CallServiceWrapper.java
@@ -181,7 +181,7 @@
         @Override
         public void handleFailedOutgoingCall(String callId, String reason) {
             mCallIdMapper.checkValidCallId(callId);
-            Log.d(this, "handleFailedOutgoingCall %d", callId);
+            Log.d(this, "handleFailedOutgoingCall %s", callId);
             SomeArgs args = SomeArgs.obtain();
             args.arg1 = callId;
             args.arg2 = reason;

src/com/android/telecomm/Log.java

diff --git a/src/com/android/telecomm/Log.java b/src/com/android/telecomm/Log.java
index b25aec1..ebcc175 100644
--- a/src/com/android/telecomm/Log.java
+++ b/src/com/android/telecomm/Log.java
@@ -32,7 +32,7 @@
     // Generic tag for all In Call logging
     private static final String TAG = "Telecomm";
 
-    public static final boolean FORCE_LOGGING = true; /* STOP SHIP if true */
+    public static final boolean FORCE_LOGGING = false; /* STOP SHIP if true */
     public static final boolean DEBUG = isLoggable(android.util.Log.DEBUG);
     public static final boolean INFO = isLoggable(android.util.Log.INFO);
     public static final boolean VERBOSE = isLoggable(android.util.Log.VERBOSE);
@@ -201,7 +201,7 @@
             msg = (args == null || args.length == 0) ? format
                     : String.format(Locale.US, format, args);
         } catch (IllegalFormatException ife) {
-            wtf("Log", ife, "IllegalFormatException: formatString='%s' numArgs=%d", format,
+            e("Log", ife, "IllegalFormatException: formatString='%s' numArgs=%d", format,
                     args.length);
             msg = format + " (An error occurred while formatting the message.)";
         }