commit da6eba039690e1cc566887555f5d33b253987550
author Shunta Sakai <shunta.sakai@sonymobile.com> Thu Mar 09 21:46:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 09 21:46:43 2017 +0000
tree 35bf41eaf1510b0f5016f4674aace78e28b27a13
parent c42e5d82a70ee2fff1b363ed36035d2605ebd195
parent fb688ca8113d6dae87e2d18ea29f09c630360c03

Disable a phone number log for user build
am: fb688ca811

Change-Id: I57c5f20a3d8b2ae5a4ad05e4c42ed447f33878be

src/java/com/android/ims/ImsCall.java

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 6812b04..42824bd 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -30,6 +30,7 @@
 import android.os.Message;
 import android.telecom.ConferenceParticipant;
 import android.telecom.Connection;
+import android.telephony.Rlog;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -1677,10 +1678,10 @@
             String endpoint = confInfo.getString(ImsConferenceState.ENDPOINT);
 
             if (CONF_DBG) {
-                logi("notifyConferenceStateUpdated :: key=" + key +
+                logi("notifyConferenceStateUpdated :: key=" + Rlog.pii(TAG, key) +
                         ", status=" + status +
-                        ", user=" + user +
-                        ", displayName= " + displayName +
+                        ", user=" + Rlog.pii(TAG, user) +
+                        ", displayName= " + Rlog.pii(TAG, displayName) +
                         ", endpoint=" + endpoint);
             }
 

src/java/com/android/ims/ImsUt.java

diff --git a/src/java/com/android/ims/ImsUt.java b/src/java/com/android/ims/ImsUt.java
index d72e5fd..75a0b52 100644
--- a/src/java/com/android/ims/ImsUt.java
+++ b/src/java/com/android/ims/ImsUt.java
@@ -149,7 +149,7 @@
     public void queryCallForward(int condition, String number, Message result) {
         if (DBG) {
             log("queryCallForward :: Ut=" + miUt + ", condition=" + condition
-                    + ", number=" + number);
+                    + ", number=" + Rlog.pii(TAG, number));
         }
 
         synchronized(mLockObj) {
@@ -349,8 +349,8 @@
             int serviceClass, int timeSeconds, Message result) {
         if (DBG) {
             log("updateCallForward :: Ut=" + miUt + ", action=" + action
-                    + ", condition=" + condition + ", number=" + number
-                    +  ", serviceClass=" + serviceClass + ", timeSeconds=" + timeSeconds);
+                    + ", condition=" + condition + ", number=" + Rlog.pii(TAG, number)
+                    + ", serviceClass=" + serviceClass + ", timeSeconds=" + timeSeconds);
         }
 
         synchronized(mLockObj) {