Do not output user information (phone number)

Elmiinate leakage of user information - phone number. Restrict to cases where
VDBG is enabled - flagged by STOPSHIP.

Bug: 19602904
Change-Id: I3e5b1f9ed8e825010f4711923dc673f25e2f7724
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaConnection.java b/src/java/com/android/internal/telephony/cdma/CdmaConnection.java
index 57389b4..acf0bee 100755
--- a/src/java/com/android/internal/telephony/cdma/CdmaConnection.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaConnection.java
@@ -136,9 +136,10 @@
         mHandler = new MyHandler(mOwner.getLooper());
 
         mDialString = dialString;
-        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + dialString);
+        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + maskDialString(dialString));
         dialString = formatDialString(dialString);
-        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection:formated dialString=" + dialString);
+        Rlog.d(LOG_TAG,
+                "[CDMAConn] CdmaConnection:formated dialString=" + maskDialString(dialString));
 
         mAddress = PhoneNumberUtils.extractNetworkPortionAlt(dialString);
         mPostDialString = PhoneNumberUtils.extractPostDialPortion(dialString);
@@ -911,6 +912,14 @@
         Rlog.d(LOG_TAG, "[CDMAConn] " + msg);
     }
 
+    private String maskDialString(String dialString) {
+        if (VDBG) {
+            return dialString;
+        }
+
+        return "<MASKED>";
+    }
+
     @Override
     public int getNumberPresentation() {
         return mNumberPresentation;
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java b/src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
index 981dec6..7531bb9 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
@@ -167,7 +167,7 @@
         public String toString() {
             return "CdmaNumberInfoRec: {" +
                     " id: " + CdmaInformationRecords.idToString(id) +
-                    ", number: " + number +
+                    ", number: <MASKED>" +
                     ", numberType: " + numberType +
                     ", numberPlan: " + numberPlan +
                     ", pi: " + pi +