Merge "remove PII from telephony log" into nyc-mr1-dev (0f6c2788) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CallForwardInfo.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.internal.telephony;

		import android.telephony.PhoneNumberUtils;

		/**
		* See also RIL_CallForwardInfo in include/telephony/ril.h
		*
		@@ -26,7 +24,7 @@ import android.telephony.PhoneNumberUtils;
		public class CallForwardInfo {
		public int status; /1 = active, 0 = not active /
		public int reason; /* from TS 27.007 7.11 "reason" */
		public int serviceClass; /* Sum of CommandsInterface.SERVICE_CLASS */
		public int serviceClass; /* Saum of CommandsInterface.SERVICE_CLASS */
		public int toa; /* "type" from TS 27.007 7.11 */
		public String number; /* "number" from TS 27.007 7.11 */
		public int timeSeconds; /* for CF no reply only */
		@@ -35,9 +33,7 @@ public class CallForwardInfo {
		public String toString() {
		return super.toString() + (status == 0 ? " not active " : " active ")
		+ " reason: " + reason
		+ " serviceClass: " + serviceClass
		+ " \"" + PhoneNumberUtils.stringFromStringAndTOA(number, toa) + "\" "
		+ timeSeconds + " seconds";
		+ " serviceClass: " + serviceClass + " " + timeSeconds + " seconds";

		}
		}

src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.telephony.Rlog;
		import android.util.Log;

		import com.android.internal.telephony.uicc.AdnRecord;
		import com.android.internal.telephony.uicc.AdnRecordCache;
		@@ -41,6 +42,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
		public class IccPhoneBookInterfaceManager {
		static final String LOG_TAG = "IccPhoneBookIM";
		protected static final boolean DBG = true;
		protected static final boolean VDBG = Rlog.isLoggable(LOG_TAG, Log.VERBOSE);

		protected Phone mPhone;
		private UiccCardApplication mCurrentApp = null;
		@@ -172,9 +174,9 @@ public class IccPhoneBookInterfaceManager {


		if (DBG) logd("updateAdnRecordsInEfBySearch: efid=0x" +
		Integer.toHexString(efid).toUpperCase() +
		" ("+ oldTag + "," + oldPhoneNumber + ")"+ "==>" +
		" ("+ newTag + "," + newPhoneNumber + ")"+ " pin2=" + pin2);
		Integer.toHexString(efid).toUpperCase() + (VDBG ? " ("+ oldTag + "," +
		oldPhoneNumber + ")" + "==>" + " ("+ newTag + ","
		+ newPhoneNumber + ")"+ " pin2=" + pin2 : ""));

		efid = updateEfForIccType(efid);

		@@ -224,9 +226,8 @@ public class IccPhoneBookInterfaceManager {
		}

		if (DBG) logd("updateAdnRecordsInEfByIndex: efid=0x" +
		Integer.toHexString(efid).toUpperCase() +
		" Index=" + index + " ==> " +
		"("+ newTag + "," + newPhoneNumber + ")"+ " pin2=" + pin2);
		Integer.toHexString(efid).toUpperCase() + " Index=" + index +
		(VDBG ? " ==> " + "(" + newTag + "," + newPhoneNumber + ")" + " pin2=" + pin2 : ""));
		synchronized(mLock) {
		checkThread();
		mSuccess = false;

src/java/com/android/internal/telephony/IccProvider.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -29,10 +29,10 @@ import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.text.TextUtils;
		import android.telephony.Rlog;
		import android.util.Log;

		import java.util.List;

		import com.android.internal.telephony.IIccPhoneBook;
		import com.android.internal.telephony.uicc.AdnRecord;
		import com.android.internal.telephony.uicc.IccConstants;

		@@ -43,6 +43,7 @@ import com.android.internal.telephony.uicc.IccConstants;
		public class IccProvider extends ContentProvider {
		private static final String TAG = "IccProvider";
		private static final boolean DBG = true;
		private static final boolean VDBG = Rlog.isLoggable(TAG, Log.VERBOSE);


		private static final String[] ADDRESS_BOOK_COLUMN_NAMES = new String[] {
		@@ -428,7 +429,7 @@ public class IccProvider extends ContentProvider {
		addIccRecordToEf(int efType, String name, String number, String[] emails,
		String pin2, int subId) {
		if (DBG) log("addIccRecordToEf: efType=0x" + Integer.toHexString(efType).toUpperCase() +
		", name=" + name + ", number=" + number + ", emails=" + emails +
		(VDBG ? ", name=" + name + ", number=" + number + ", emails=" + emails : "") +
		", subscription=" + subId);

		boolean success = false;
		@@ -458,9 +459,8 @@ public class IccProvider extends ContentProvider {
		updateIccRecordInEf(int efType, String oldName, String oldNumber,
		String newName, String newNumber, String pin2, int subId) {
		if (DBG) log("updateIccRecordInEf: efType=0x" + Integer.toHexString(efType).toUpperCase() +
		", oldname=" + oldName + ", oldnumber=" + oldNumber +
		", newname=" + newName + ", newnumber=" + newNumber +
		", subscription=" + subId);
		(VDBG ? ", oldname=" + oldName + ", oldnumber=" + oldNumber + ", newname=" +
		newName + ", newnumber=" + newName : "") + ", subscription=" + subId);

		boolean success = false;

		@@ -484,9 +484,8 @@ public class IccProvider extends ContentProvider {
		private boolean deleteIccRecordFromEf(int efType, String name, String number, String[] emails,
		String pin2, int subId) {
		if (DBG) log("deleteIccRecordFromEf: efType=0x" +
		Integer.toHexString(efType).toUpperCase() +
		", name=" + name + ", number=" + number + ", emails=" + emails +
		", pin2=" + pin2 + ", subscription=" + subId);
		Integer.toHexString(efType).toUpperCase() + (VDBG ? ", name=" + name + ", number=" +
		number + ", emails=" + emails + ", pin2=" + pin2 : "") + ", subscription=" + subId);

		boolean success = false;

		@@ -518,7 +517,7 @@ public class IccProvider extends ContentProvider {
		String alphaTag = record.getAlphaTag();
		String number = record.getNumber();

		if (DBG) log("loadRecord: " + alphaTag + ", " + number + ",");
		if (DBG) log("loadRecord: " + alphaTag + (VDBG ? ", " + number : ""));
		contact[0] = alphaTag;
		contact[1] = number;

		@@ -526,7 +525,7 @@ public class IccProvider extends ContentProvider {
		if (emails != null) {
		StringBuilder emailString = new StringBuilder();
		for (String email: emails) {
		if (DBG) log("Adding email:" + email);
		if (VDBG) log("Adding email:" + email);
		emailString.append(email);
		emailString.append(",");
		}

src/java/com/android/internal/telephony/cdma/sms/BearerData.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.telephony.cdma.CdmaSmsCbProgramData;
		import android.telephony.cdma.CdmaSmsCbProgramResults;
		import android.text.format.Time;
		import android.telephony.Rlog;
		import android.util.Log;

		import com.android.internal.telephony.GsmAlphabet;
		import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
		@@ -435,7 +436,8 @@ public final class BearerData {
		builder.append(", readAckReq=" + readAckReq);
		builder.append(", reportReq=" + reportReq);
		builder.append(", numberOfMessages=" + numberOfMessages);
		builder.append(", callbackNumber=" + callbackNumber);
		builder.append(", callbackNumber=" +
		(Rlog.isLoggable(LOG_TAG, Log.DEBUG) ? callbackNumber : "XXX"));
		builder.append(", depositIndex=" + depositIndex);
		builder.append(", hasUserDataHeader=" + hasUserDataHeader);
		builder.append(", userData=" + userData);

src/java/com/android/internal/telephony/uicc/IccRecords.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -133,9 +133,9 @@ public abstract class IccRecords extends Handler implements IccConstants {
		+ " recordsRequested=" + mRecordsRequested
		+ " iccid=" + iccIdToPrint
		+ " msisdnTag=" + mMsisdnTag
		+ " voiceMailNum=" + mVoiceMailNum
		+ (VDBG ? (" voiceMailNum=" + mVoiceMailNum) : "")
		+ " voiceMailTag=" + mVoiceMailTag
		+ " newVoiceMailNum=" + mNewVoiceMailNum
		+ (VDBG ? (" voiceMailNum=" + mNewVoiceMailNum) : "")
		+ " newVoiceMailTag=" + mNewVoiceMailTag
		+ " isVoiceMailFixed=" + mIsVoiceMailFixed
		+ (VDBG ? (" mImsi=" + mImsi) : "")
		@@ -743,9 +743,9 @@ public abstract class IccRecords extends Handler implements IccConstants {
		pw.println(" mMsisdn=" + (VDBG ? mMsisdn : "XXX"));
		}
		pw.println(" mMsisdnTag=" + mMsisdnTag);
		pw.println(" mVoiceMailNum=" + mVoiceMailNum);
		pw.println(" mVoiceMailNum=" + (VDBG ? mVoiceMailNum : "XXX"));
		pw.println(" mVoiceMailTag=" + mVoiceMailTag);
		pw.println(" mNewVoiceMailNum=" + mNewVoiceMailNum);
		pw.println(" mNewVoiceMailNum=" +(VDBG ? mNewVoiceMailNum : "XXX"));
		pw.println(" mNewVoiceMailTag=" + mNewVoiceMailTag);
		pw.println(" mIsVoiceMailFixed=" + mIsVoiceMailFixed);
		if (VDBG) pw.println(" mImsi=" + mImsi);