Merge "Disable a phone number log for user build" (58046e21) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/GsmMmiCode.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1611,10 +1611,10 @@ public final class GsmMmiCode extends Handler implements MmiCode {
		sb.append("State=" + getState());
		if (mAction != null) sb.append(" action=" + mAction);
		if (mSc != null) sb.append(" sc=" + mSc);
		if (mSia != null) sb.append(" sia=" + mSia);
		if (mSib != null) sb.append(" sib=" + mSib);
		if (mSic != null) sb.append(" sic=" + mSic);
		if (mPoundString != null) sb.append(" poundString=" + mPoundString);
		if (mSia != null) sb.append(" sia=" + Rlog.pii(LOG_TAG, mSia));
		if (mSib != null) sb.append(" sib=" + Rlog.pii(LOG_TAG, mSib));
		if (mSic != null) sb.append(" sic=" + Rlog.pii(LOG_TAG, mSic));
		if (mPoundString != null) sb.append(" poundString=" + Rlog.pii(LOG_TAG, mPoundString));
		if (mDialingNumber != null) sb.append(" dialingNumber=" + mDialingNumber);
		if (mPwd != null) sb.append(" pwd=" + mPwd);
		sb.append("}");

+11 −8

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ public class SipPhone extends SipPhoneBase {
		try {
		SipAudioCall sipAudioCall = (SipAudioCall) incomingCall;
		if (DBG) log("takeIncomingCall: taking call from: "
		+ sipAudioCall.getPeerProfile().getUriString());
		+ hidePii(sipAudioCall.getPeerProfile().getUriString()));
		String localUri = sipAudioCall.getLocalProfile().getUriString();
		if (localUri.equals(mProfile.getUriString())) {
		boolean makeCallWait = mForegroundCall.getState().isAlive();
		@@ -813,11 +813,12 @@ public class SipPhone extends SipPhoneBase {
		setState(newState);
		}
		mOwner.onConnectionStateChanged(SipConnection.this);
		if (SCN_DBG) log("onChanged: "
		+ mPeer.getUriString() + ": " + mState
		if (SCN_DBG) {
		log("onChanged: " + hidePii(mPeer.getUriString()) + ": " + mState
		+ " on phone " + getPhone());
		}
		}
		}

		@Override
		protected void onError(int cause) {
		@@ -950,9 +951,11 @@ public class SipPhone extends SipPhoneBase {
		@Override
		public void hangup() throws CallStateException {
		synchronized (SipPhone.class) {
		if (SCN_DBG) log("hangup: conn=" + mPeer.getUriString()
		if (SCN_DBG) {
		log("hangup: conn=" + hidePii(mPeer.getUriString())
		+ ": " + mState + ": on phone "
		+ getPhone().getPhoneName());
		}
		if (!mState.isAlive()) return;
		try {
		SipAudioCall sipAudioCall = mSipAudioCall;
		@@ -1076,6 +1079,6 @@ public class SipPhone extends SipPhoneBase {
		}

		public static String hidePii(String s) {
		return VDBG ? s : "xxxxx";
		return VDBG ? Rlog.pii(LOG_TAG, s) : "xxxxx";
		}
		}