merge in oc-release history after reset to 44bc69bca87dcee6947d37fa674789f2b3dc64d4
gitbuildkicker [Tue, 14 Mar 2017 00:18:22 +0000 (17:18 -0700)]
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/ImsUt.java

index a6d0a0c..b2c98df 100644 (file)
@@ -30,7 +30,6 @@ import android.os.Bundle;
 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;
 
@@ -1678,10 +1677,10 @@ public class ImsCall implements ICall {
             String endpoint = confInfo.getString(ImsConferenceState.ENDPOINT);
 
             if (CONF_DBG) {
-                logi("notifyConferenceStateUpdated :: key=" + Rlog.pii(TAG, key) +
+                logi("notifyConferenceStateUpdated :: key=" + key +
                         ", status=" + status +
-                        ", user=" + Rlog.pii(TAG, user) +
-                        ", displayName= " + Rlog.pii(TAG, displayName) +
+                        ", user=" + user +
+                        ", displayName= " + displayName +
                         ", endpoint=" + endpoint);
             }
 
index 75a0b52..d72e5fd 100644 (file)
@@ -149,7 +149,7 @@ public class ImsUt implements ImsUtInterface {
     public void queryCallForward(int condition, String number, Message result) {
         if (DBG) {
             log("queryCallForward :: Ut=" + miUt + ", condition=" + condition
-                    + ", number=" + Rlog.pii(TAG, number));
+                    + ", number=" + number);
         }
 
         synchronized(mLockObj) {
@@ -349,8 +349,8 @@ public class ImsUt implements ImsUtInterface {
             int serviceClass, int timeSeconds, Message result) {
         if (DBG) {
             log("updateCallForward :: Ut=" + miUt + ", action=" + action
-                    + ", condition=" + condition + ", number=" + Rlog.pii(TAG, number)
-                    + ", serviceClass=" + serviceClass + ", timeSeconds=" + timeSeconds);
+                    + ", condition=" + condition + ", number=" + number
+                    +  ", serviceClass=" + serviceClass + ", timeSeconds=" + timeSeconds);
         }
 
         synchronized(mLockObj) {