Do not log phone number and name even for debug.

Bug: 29596374
Change-Id: Ibd9f810627955c7f5cadb1ff0b0eebddaff9f270

11 files changed, 6 insertions, 60 deletions

diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
index 5d3e12f..0502828 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
@@ -385,7 +385,6 @@ public class CapabilityPolling {
     }
 
     private void newContactAdded(String number) {
-        logger.print("Enter newContactAdded: " + number);
         if (TextUtils.isEmpty(number)) {
             return;
         }
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java b/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
index cefe50b..5b42a6f 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
@@ -135,7 +135,7 @@ public class EABContactManager {
         public Request(String number) {
             if (TextUtils.isEmpty(number)) {
                 throw new IllegalArgumentException(
-                        "Can't update EAB presence item with number: " + number);
+                        "Can't update EAB presence item with");
             }
 
             mContactNumber = number;
@@ -706,7 +706,6 @@ public class EABContactManager {
                         null, null);
             }
 
-            logger.debug("Update contact " + number + " with request: " + values);
             return mResolver.update(mBaseUri, values, getWhereClauseForIds(ids),
                     getWhereArgsForIds(ids));
         }
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java b/rcs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java
index 8e851dc..44ab61e 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java
@@ -114,10 +114,6 @@ public class EABDbUtil {
                             if (null != dataId) {
                                 allEligibleContacts.add(new PresenceContact(contactName,
                                         contactNumber, rawContactId, contactId, dataId));
-                                logger.debug("Eligible List Name: " + contactName +
-                                        " Number:" + contactNumber +
-                                        " RawContactID: " + rawContactId +
-                                        " contactId: " + contactId + " Data.ID : " + dataId);
                             } else {
                                 logger.debug("dataId is null. Don't add contact to " +
                                         "allEligibleContacts.");
@@ -399,7 +395,6 @@ public class EABDbUtil {
         if ( ContactNumberUtils.NUMBER_VALID == numberType) {
             number = true;
         }
-        logger.debug("Exiting validateEligibleContact with value : " + number);
         return number;
     }
 
@@ -422,7 +417,6 @@ public class EABDbUtil {
                 number = mdnFormatted[0];
             }
         }
-        logger.debug("After filterEligibleContact validation / formatting : " + number);
         return number;
     }
 }
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/EABProvider.java b/rcs/presencepolling/src/com/android/service/ims/presence/EABProvider.java
index 651b1cd..8d2acd0 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/EABProvider.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/EABProvider.java
@@ -377,8 +377,6 @@ public class EABProvider extends DatabaseContentProvider{
         Cursor cursor = getContext().getContentResolver().query(EABContract.EABColumns.CONTENT_URI,
                         projection, whereClause, selectionArgs, null);
         if ((null != cursor) && (cursor.getCount() > 0)) {
-            logger.debug("Number : " + phoneNumber +
-                    " is already stored in EAB DB - cursor count is " + cursor.getCount());
             logger.error("Inserting another copy of MDN to EAB DB.");
             // Update data only from first cursor element.
             cursor.moveToNext();
@@ -439,9 +437,6 @@ public class EABProvider extends DatabaseContentProvider{
                         EABContract.EABColumns.CONTACT_NUMBER));
                 String displayName = cursor.getString(cursor.getColumnIndex(
                         EABContract.EABColumns.CONTACT_NAME));
-                logger.debug("Deleting : dataId : " + dataId + " contactId :"  + contactId +
-                        " rawContactId :" + rawContactId + " phoneNumber :" + phoneNumber +
-                        " displayName :" + displayName);
             }
         } else {
             logger.error("cursor is null!");
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/EABService.java b/rcs/presencepolling/src/com/android/service/ims/presence/EABService.java
index e79293c..f6bd89f 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/EABService.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/EABService.java
@@ -486,9 +486,6 @@ EAB_RESET_CONTENT_OBSERVERS));
                             ContactsContract.Data.DATA1));
                     String displayName = cursor.getString(cursor.getColumnIndex(
                            ContactsContract.Data.DISPLAY_NAME));
-                    logger.debug("dataId : " + dataId + " rawContactId :"  + rawContactId +
-                           " contactId : " + contactId
-                           + " phoneNumber :" + phoneNumber + " displayName :" + displayName);
                     verifyInsertOrUpdateAction(dataId, contactId, rawContactId, phoneNumber,
                           displayName);
                     if (uniqueRawContactIds.isEmpty()) {
@@ -522,7 +519,6 @@ EAB_RESET_CONTENT_OBSERVERS));
 
     private void verifyInsertOrUpdateAction(Long dataId, Long contactId,
             Long rawContactId, String phoneNumber, String displayName) {
-        logger.debug("Enter: verifyInsertOrUpdateAction() phoneNumber : " + phoneNumber);
         if (null == phoneNumber){
             logger.error("Error: return as phoneNumber is null");
             return;
@@ -549,8 +545,6 @@ EAB_RESET_CONTENT_OBSERVERS));
                                     .getColumnIndex(EABContract.EABColumns.CONTACT_NUMBER));
                     String eabDisplayName = eabCursor.getString(eabCursor
                             .getColumnIndex(EABContract.EABColumns.CONTACT_NAME));
-                    logger.debug("phoneNumber : " + phoneNumber
-                            + " eabPhoneNumber :" + eabPhoneNumber);
                     // Contact names should match and both numbers should not be
                     // null & should not match.
                     if ((null != eabPhoneNumber)
@@ -659,7 +653,6 @@ EAB_RESET_CONTENT_OBSERVERS));
                         while (eabDbCursor.moveToNext()) {
                             String eabPhoneNumber = eabDbCursor.getString(eabDbCursor
                                     .getColumnIndex(EABContract.EABColumns.CONTACT_NUMBER));
-                            logger.debug("eabPhoneNumber :" + eabPhoneNumber);
                             Long eabDataId = Long.valueOf(eabDbCursor.getLong(eabDbCursor
                                     .getColumnIndex(EABContract.EABColumns.DATA_ID)));
                             logger.debug("eabDataId :" + eabDataId);
@@ -669,8 +662,8 @@ EAB_RESET_CONTENT_OBSERVERS));
                                 eabDataIdList.add(eabDataId);
                             } else {
                                 // Something is wrong. There can not be duplicate numbers.
-                                logger.error("Duplicate entry for PhoneNumber :" + eabPhoneNumber
-                                        + " with DataId : " + eabDataId + " found in EABProvider.");
+                                logger.error("Duplicate entry for DataId : " + eabDataId +
+                                    " found in EABProvider.");
                             }
                         }
                         logger.debug("Before computation eabDataIdList size :" +
@@ -681,15 +674,12 @@ EAB_RESET_CONTENT_OBSERVERS));
                             Long contactDataId = Long.valueOf(contactDbCursor.getLong(
                                     contactDbCursor
                                             .getColumnIndex(ContactsContract.Data._ID)));
-                            logger.debug("contactPhoneNumber : " + contactPhoneNumber +
-                                    " dataId : " + contactDataId);
                             if (eabDataIdList.contains(contactDataId) )  {
                                 eabDataIdList.remove(contactDataId);
                                 logger.debug("Number removed from eabDataIdList");
                             } else {
                                 // Something is wrong. There can not be new number in Contacts DB.
-                                logger.error("Number :" + contactPhoneNumber
-                                        + " with DataId : " + contactDataId +
+                                logger.error("DataId " + contactDataId +
                                         " not found in EABProvider.");
                             }
                         }
@@ -805,11 +795,6 @@ EAB_RESET_CONTENT_OBSERVERS));
                             ContactsContract.Contacts.Entity.DATA1));
                     String profileName = cursor.getString(cursor.getColumnIndex(
                             ContactsContract.Contacts.Entity.DISPLAY_NAME));
-                    logger.debug("Profile Name : " + profileName
-                            + " Profile Number : " + contactNumber
-                            + " profile dataId : " + dataId
-                            + " profile rawContactId : " + rawContactId
-                            + " profile contactId : " + contactId);
                     if (profileDataIdList.isEmpty()) {
                         profileDataIdList.add(dataId);
                         profileNumberList.clear();
@@ -819,8 +804,7 @@ EAB_RESET_CONTENT_OBSERVERS));
                         profileNumberList.add(contactNumber);
                     } else {
                         // There are duplicate entries in Profile's Table
-                        logger.error("Duplicate entry in Profile's Table for contact :" +
-                                contactNumber + " dataId : " + dataId);
+                        logger.error("Duplicate entry in Profile's Table for dataId : " + dataId);
                     }
                     verifyInsertOrUpdateAction(dataId, contactId, rawContactId, contactNumber,
                             profileName);
@@ -960,10 +944,6 @@ EAB_RESET_CONTENT_OBSERVERS));
     private void handlePhoneNumberInsertion(Long dataId, Long contactId,
             Long rawContactId, String phoneNumber, String contactName) {
 
-        logger.debug("handlePhoneNumberInsertion() rawContactId : "
-                + rawContactId + " dataId :" + dataId + " contactId :"
-                + contactId + " phoneNumber :" + phoneNumber + " contactName :"
-                + contactName);
         if (!EABDbUtil.validateEligibleContact(mContext, phoneNumber)) {
             logger.debug("Return as number is not elegible for VT.");
             return;
@@ -992,11 +972,6 @@ EAB_RESET_CONTENT_OBSERVERS));
             Long rawContactId, String oldPhoneNumber, String newPhoneNumber,
             String contactName) {
 
-        logger.debug("handlePhoneNumberChanged() rawContactId : " + rawContactId
-                + " dataId :" + dataId + " oldPhoneNumber :" + oldPhoneNumber
-                + " newPhoneNumber :" + newPhoneNumber + " contactName :"
-                + contactName);
-
         if (null == oldPhoneNumber && null == newPhoneNumber) {
             logger.debug("Both old and new numbers are null.");
             return;
@@ -1055,8 +1030,6 @@ EAB_RESET_CONTENT_OBSERVERS));
 
     private void handlePhoneNameUpdate(Long dataId, Long contactId,
             Long rawContactId, String phoneNumber, String newDisplayName) {
-        logger.debug("handlePhoneNameUpdate() rawContactId : " + rawContactId
-                + " dataId :" + dataId + " newDisplayName :" + newDisplayName);
         String sRawContactId = null;
         String sDataId = null;
         String sContactId = null;
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java b/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java
index 69c4018..aeb8f16 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java
@@ -165,7 +165,7 @@ public class PollingTask {
                     .setLastUpdatedTimeStamp(current);
             int result = contactManager.update(request);
             if (result <= 0) {
-                logger.debug("failed to update timestamp for contact: " + number);
+                logger.debug("failed to update timestamp for contact: ");
             }
         }
     }
diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
index d5ce570..f4b8d6d 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java
@@ -223,7 +223,6 @@ public class RcsService extends Service{
          * @hide
          */
         public int requestAvailability(String contactNumber, IRcsPresenceListener listener){
-            logger.debug("calling requestAvailability, contactNumber=" + contactNumber);
             if(mSubscriber == null){
                 logger.error("requestAvailability, mPresenceSubscriber is null");
                 return ResultCode.ERROR_SERVICE_NOT_AVAILABLE;
@@ -246,7 +245,6 @@ public class RcsService extends Service{
          */
         public int requestAvailabilityNoThrottle(String contactNumber,
                 IRcsPresenceListener listener) {
-            logger.debug("calling requestAvailabilityNoThrottle, contactNumber=" + contactNumber);
             if(mSubscriber == null){
                 logger.error("requestAvailabilityNoThrottle, mPresenceSubscriber is null");
                 return ResultCode.ERROR_SERVICE_NOT_AVAILABLE;
diff --git a/rcs/rcsservice/src/com/android/service/ims/TaskManager.java b/rcs/rcsservice/src/com/android/service/ims/TaskManager.java
index 4e931ac..74e11a6 100644
--- a/rcs/rcsservice/src/com/android/service/ims/TaskManager.java
+++ b/rcs/rcsservice/src/com/android/service/ims/TaskManager.java
@@ -191,7 +191,6 @@ public class TaskManager{
     }
 
     public void onTerminated(String contact){ // for single number capability polling
-        logger.debug("onTerminated contact=" + contact);
         if(contact == null){
             return;
         }
@@ -379,15 +378,12 @@ public class TaskManager{
                 if(task instanceof PresenceAvailabilityTask){
                     PresenceAvailabilityTask availabilityTask = (PresenceAvailabilityTask)task;
                     if(PhoneNumberUtils.compare(contact, availabilityTask.mContacts[0])){
-                        logger.debug("getTaskByContact contact=" + contact +
-                                " task=" + availabilityTask);
                         return availabilityTask;
                     }
                 }
             }
         }
 
-        logger.debug("getTaskByContact, contact=" + contact + " task=null");
         return null;
     }
 }
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java
index 0e8f2d3..6dabb28 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java
@@ -271,7 +271,6 @@ public class PresenceInfoParser{
             return number = number.substring(startIndex + 1);
         }
 
-        logger.debug("number=" + number);
         return number;
     }
 }
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
index 05dcd7a..99a213f 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
@@ -209,8 +209,6 @@ public class PresencePublication extends PresenceBase {
                                      String[] myImpu = teleMgr.getIsimImpu();
                                      String myDomain = teleMgr.getIsimDomain();
                                      String line1Number = teleMgr.getLine1Number();
-                                     logger.debug("myImpu=" + myImpu + " myDomain=" + myDomain +
-                                              " line1Number=" + line1Number);
                                      if(line1Number != null && line1Number.length() != 0 ||
                                          myImpu != null && myImpu.length != 0 &&
                                          myDomain != null && myDomain.length() != 0){
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
index 60a783b..37c141e 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
@@ -124,7 +124,6 @@ public class PresenceSubscriber extends PresenceBase{
 
     public int requestCapability(List<String> contactsNumber,
             IRcsPresenceListener listener){
-        logger.debug("requestCapability contactsNumber=" + contactsNumber);
 
         int ret = mRcsStackAdaptor.checkStackAndPublish();
         if(ret < ResultCode.SUCCESS){
@@ -184,8 +183,6 @@ public class PresenceSubscriber extends PresenceBase{
 
     public int requestAvailability(String contactNumber, IRcsPresenceListener listener,
             boolean forceToNetwork){
-        logger.print("requestAvailability contactNumber=" + contactNumber +
-                " forceToNetwork=" + forceToNetwork);
 
         String formatedContact = ContactNumberUtils.getDefault().format(contactNumber);
         int ret = ContactNumberUtils.getDefault().validate(formatedContact);
@@ -420,7 +417,6 @@ public class PresenceSubscriber extends PresenceBase{
             ArrayList<RcsPresenceInfo> presenceInfoList = new ArrayList<RcsPresenceInfo>();
 
             for(int i=0; i<contacts.length; i++){
-                logger.debug("404 error: task.mContacts[" + i + "]=" + contacts[i]);
                 if(TextUtils.isEmpty(contacts[i])){
                     continue;
                 }
@@ -454,7 +450,6 @@ public class PresenceSubscriber extends PresenceBase{
     }
 
     public void retryToGetAvailability() {
-        logger.debug("retryToGetAvailability, number=" + mAvailabilityRetryNumber);
         if(mAvailabilityRetryNumber == null){
             return;
         }