Merge "Log phone id for debugging multi SIM devices" (97ca162d) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1634,7 +1634,7 @@ public class GsmCdmaCallTracker extends CallTracker {

		@Override
		protected void log(String msg) {
		Rlog.d(LOG_TAG, "[GsmCdmaCallTracker] " + msg);
		Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);
		}

		@Override

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3545,15 +3545,15 @@ public class GsmCdmaPhone extends Phone {
		}

		private void logd(String s) {
		Rlog.d(LOG_TAG, "[GsmCdmaPhone] " + s);
		Rlog.d(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		private void logi(String s) {
		Rlog.i(LOG_TAG, "[GsmCdmaPhone] " + s);
		Rlog.i(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		private void loge(String s) {
		Rlog.e(LOG_TAG, "[GsmCdmaPhone] " + s);
		Rlog.e(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		@Override

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2424,11 +2424,11 @@ public class ServiceStateTracker extends Handler {
		}

		protected final void log(String s) {
		Rlog.d(LOG_TAG, s);
		Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + s);
		}

		protected final void loge(String s) {
		Rlog.e(LOG_TAG, s);
		Rlog.e(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + s);
		}

		/**

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+76 −73

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ import android.os.RegistrantList;
		import android.os.ResultReceiver;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.telecom.VideoProfile;
		import android.telephony.CarrierConfigManager;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.Rlog;
		@@ -94,7 +93,6 @@ import com.android.internal.telephony.PhoneNotifier;
		import com.android.internal.telephony.TelephonyComponentFactory;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.gsm.GsmMmiCode;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.uicc.IccRecords;
		@@ -289,7 +287,7 @@ public class ImsPhone extends ImsPhoneBase {
		//todo: get rid of this function. It is not needed since parentPhone obj never changes
		@Override
		public void dispose() {
		Rlog.d(LOG_TAG, "dispose");
		logd("dispose");
		// Nothing to dispose in Phone
		//super.dispose();
		mPendingMMIs.clear();
		@@ -419,7 +417,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		if (getRingingCall().getState() != ImsPhoneCall.State.IDLE) {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 0: rejectCall");
		if (DBG) logd("MmiCode 0: rejectCall");
		try {
		mCT.rejectCall();
		} catch (CallStateException e) {
		@@ -427,7 +425,7 @@ public class ImsPhone extends ImsPhoneBase {
		notifySuppServiceFailed(Phone.SuppService.REJECT);
		}
		} else if (getBackgroundCall().getState() != ImsPhoneCall.State.IDLE) {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 0: hangupWaitingOrBackground");
		if (DBG) logd("MmiCode 0: hangupWaitingOrBackground");
		try {
		mCT.hangup(getBackgroundCall());
		} catch (CallStateException e) {
		@@ -452,7 +450,7 @@ public class ImsPhone extends ImsPhoneBase {
		throws CallStateException {
		if (mPendingMMIs.size() > 0) {
		// There are MMI codes in progress; fail attempt now.
		Rlog.i(LOG_TAG, "handleUssdRequest: queue full: " + Rlog.pii(LOG_TAG, ussdRequest));
		logi("handleUssdRequest: queue full: " + Rlog.pii(LOG_TAG, ussdRequest));
		sendUssdResponse(ussdRequest, null, TelephonyManager.USSD_RETURN_FAILURE,
		wrappedCallback );
		return true;
		@@ -488,14 +486,14 @@ public class ImsPhone extends ImsPhoneBase {

		try {
		if (len > 1) {
		if (DBG) Rlog.d(LOG_TAG, "not support 1X SEND");
		if (DBG) logd("not support 1X SEND");
		notifySuppServiceFailed(Phone.SuppService.HANGUP);
		} else {
		if (call.getState() != ImsPhoneCall.State.IDLE) {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 1: hangup foreground");
		if (DBG) logd("MmiCode 1: hangup foreground");
		mCT.hangup(call);
		} else {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 1: switchWaitingOrHoldingAndActive");
		if (DBG) logd("MmiCode 1: switchWaitingOrHoldingAndActive");
		mCT.switchWaitingOrHoldingAndActive();
		}
		}
		@@ -515,15 +513,15 @@ public class ImsPhone extends ImsPhoneBase {
		}

		if (len > 1) {
		if (DBG) Rlog.d(LOG_TAG, "separate not supported");
		if (DBG) logd("separate not supported");
		notifySuppServiceFailed(Phone.SuppService.SEPARATE);
		} else {
		try {
		if (getRingingCall().getState() != ImsPhoneCall.State.IDLE) {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 2: accept ringing call");
		if (DBG) logd("MmiCode 2: accept ringing call");
		mCT.acceptCall(ImsCallProfile.CALL_TYPE_VOICE);
		} else {
		if (DBG) Rlog.d(LOG_TAG, "MmiCode 2: switchWaitingOrHoldingAndActive");
		if (DBG) logd("MmiCode 2: switchWaitingOrHoldingAndActive");
		mCT.switchWaitingOrHoldingAndActive();
		}
		} catch (CallStateException e) {
		@@ -541,7 +539,7 @@ public class ImsPhone extends ImsPhoneBase {
		return false;
		}

		if (DBG) Rlog.d(LOG_TAG, "MmiCode 3: merge calls");
		if (DBG) logd("MmiCode 3: merge calls");
		conference();
		return true;
		}
		@@ -554,7 +552,7 @@ public class ImsPhone extends ImsPhoneBase {
		return false;
		}

		if (DBG) Rlog.d(LOG_TAG, "MmiCode 4: not support explicit call transfer");
		if (DBG) logd("MmiCode 4: not support explicit call transfer");
		notifySuppServiceFailed(Phone.SuppService.TRANSFER);
		return true;
		}
		@@ -564,14 +562,14 @@ public class ImsPhone extends ImsPhoneBase {
		return false;
		}

		Rlog.i(LOG_TAG, "MmiCode 5: CCBS not supported!");
		logi("MmiCode 5: CCBS not supported!");
		// Treat it as an "unknown" service.
		notifySuppServiceFailed(Phone.SuppService.UNKNOWN);
		return true;
		}

		public void notifySuppSvcNotification(SuppServiceNotification suppSvc) {
		Rlog.d(LOG_TAG, "notifySuppSvcNotification: suppSvc = " + suppSvc);
		logd("notifySuppSvcNotification: suppSvc = " + suppSvc);

		AsyncResult ar = new AsyncResult(null, suppSvc, null);
		mSsnRegistrants.notifyRegistrants(ar);
		@@ -685,8 +683,7 @@ public class ImsPhone extends ImsPhoneBase {
		String networkPortion = PhoneNumberUtils.extractNetworkPortionAlt(newDialString);
		ImsPhoneMmiCode mmi =
		ImsPhoneMmiCode.newFromDialString(networkPortion, this, wrappedCallback);
		if (DBG) Rlog.d(LOG_TAG,
		"dialInternal: dialing w/ mmi '" + mmi + "'...");
		if (DBG) logd("dialInternal: dialing w/ mmi '" + mmi + "'...");

		if (mmi == null) {
		return mCT.dial(dialString, imsDialArgsBuilder.build());
		@@ -699,7 +696,7 @@ public class ImsPhone extends ImsPhoneBase {
		// Note: This code is never reached; there is a bug in isSupportedOverImsPhone which
		// causes it to return true even though the "processCode" method ultimately throws the
		// exception.
		Rlog.i(LOG_TAG, "dialInternal: USSD not supported by IMS; fallback to CS.");
		logi("dialInternal: USSD not supported by IMS; fallback to CS.");
		throw new CallStateException(CS_FALLBACK);
		} else {
		mPendingMMIs.add(mmi);
		@@ -709,7 +706,7 @@ public class ImsPhone extends ImsPhoneBase {
		mmi.processCode();
		} catch (CallStateException cse) {
		if (CS_FALLBACK.equals(cse.getMessage())) {
		Rlog.i(LOG_TAG, "dialInternal: fallback to GSM required.");
		logi("dialInternal: fallback to GSM required.");
		// Make sure we remove from the list of pending MMIs since it will handover to
		// GSM.
		mPendingMMIs.remove(mmi);
		@@ -725,8 +722,7 @@ public class ImsPhone extends ImsPhoneBase {
		public void
		sendDtmf(char c) {
		if (!PhoneNumberUtils.is12Key(c)) {
		Rlog.e(LOG_TAG,
		"sendDtmf called with invalid character '" + c + "'");
		loge("sendDtmf called with invalid character '" + c + "'");
		} else {
		if (mCT.getState() == PhoneConstants.State.OFFHOOK) {
		mCT.sendDtmf(c, null);
		@@ -738,8 +734,7 @@ public class ImsPhone extends ImsPhoneBase {
		public void
		startDtmf(char c) {
		if (!(PhoneNumberUtils.is12Key(c) \|\| (c >= 'A' && c <= 'D'))) {
		Rlog.e(LOG_TAG,
		"startDtmf called with invalid character '" + c + "'");
		loge("startDtmf called with invalid character '" + c + "'");
		} else {
		mCT.startDtmf(c);
		}
		@@ -752,7 +747,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		public void notifyIncomingRing() {
		if (DBG) Rlog.d(LOG_TAG, "notifyIncomingRing");
		if (DBG) logd("notifyIncomingRing");
		AsyncResult ar = new AsyncResult(null, null, null);
		sendMessage(obtainMessage(EVENT_CALL_RING, ar));
		}
		@@ -857,7 +852,7 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void getOutgoingCallerIdDisplay(Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "getCLIR");
		if (DBG) logd("getCLIR");
		Message resp;
		resp = obtainMessage(EVENT_GET_CLIR_DONE, onComplete);

		@@ -871,7 +866,7 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void setOutgoingCallerIdDisplay(int clirMode, Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCLIR action= " + clirMode);
		if (DBG) logd("setCLIR action= " + clirMode);
		Message resp;
		// Packing CLIR value in the message. This will be required for
		// SharedPreference caching, if the message comes back as part of
		@@ -888,9 +883,9 @@ public class ImsPhone extends ImsPhoneBase {
		@Override
		public void getCallForwardingOption(int commandInterfaceCFReason,
		Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "getCallForwardingOption reason=" + commandInterfaceCFReason);
		if (DBG) logd("getCallForwardingOption reason=" + commandInterfaceCFReason);
		if (isValidCommandInterfaceCFReason(commandInterfaceCFReason)) {
		if (DBG) Rlog.d(LOG_TAG, "requesting call forwarding query.");
		if (DBG) logd("requesting call forwarding query.");
		Message resp;
		resp = obtainMessage(EVENT_GET_CALL_FORWARD_DONE, onComplete);

		@@ -921,8 +916,10 @@ public class ImsPhone extends ImsPhoneBase {
		int serviceClass,
		int timerSeconds,
		Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallForwardingOption action=" + commandInterfaceCFAction
		if (DBG) {
		logd("setCallForwardingOption action=" + commandInterfaceCFAction
		+ ", reason=" + commandInterfaceCFReason + " serviceClass=" + serviceClass);
		}
		if ((isValidCommandInterfaceCFAction(commandInterfaceCFAction)) &&
		(isValidCommandInterfaceCFReason(commandInterfaceCFReason))) {
		Message resp;
		@@ -949,7 +946,7 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void getCallWaiting(Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "getCallWaiting");
		if (DBG) logd("getCallWaiting");
		Message resp;
		resp = obtainMessage(EVENT_GET_CALL_WAITING_DONE, onComplete);

		@@ -967,7 +964,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		public void setCallWaiting(boolean enable, int serviceClass, Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallWaiting enable=" + enable);
		if (DBG) logd("setCallWaiting enable=" + enable);
		Message resp;
		resp = obtainMessage(EVENT_SET_CALL_WAITING_DONE, onComplete);

		@@ -1012,10 +1009,7 @@ public class ImsPhone extends ImsPhoneBase {
		@Override
		public void getCallBarring(String facility, String password, Message onComplete,
		int serviceClass) {
		if (DBG) {
		Rlog.d(LOG_TAG, "getCallBarring facility=" + facility
		+ ", serviceClass = " + serviceClass);
		}
		if (DBG) logd("getCallBarring facility=" + facility + ", serviceClass = " + serviceClass);
		Message resp;
		resp = obtainMessage(EVENT_GET_CALL_BARRING_DONE, onComplete);

		@@ -1038,7 +1032,7 @@ public class ImsPhone extends ImsPhoneBase {
		public void setCallBarring(String facility, boolean lockState, String password,
		Message onComplete, int serviceClass) {
		if (DBG) {
		Rlog.d(LOG_TAG, "setCallBarring facility=" + facility
		logd("setCallBarring facility=" + facility
		+ ", lockState=" + lockState + ", serviceClass = " + serviceClass);
		}
		Message resp;
		@@ -1064,7 +1058,7 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void sendUssdResponse(String ussdMessge) {
		Rlog.d(LOG_TAG, "sendUssdResponse");
		logd("sendUssdResponse");
		ImsPhoneMmiCode mmi = ImsPhoneMmiCode.newFromUssdUserInput(ussdMessge, this);
		mPendingMMIs.add(mmi);
		mMmiRegistrants.notifyRegistrants(new AsyncResult(null, mmi, null));
		@@ -1081,7 +1075,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		private void sendErrorResponse(Message onComplete) {
		Rlog.d(LOG_TAG, "sendErrorResponse");
		logd("sendErrorResponse");
		if (onComplete != null) {
		AsyncResult.forMessage(onComplete, null,
		new CommandException(CommandException.Error.GENERIC_FAILURE));
		@@ -1091,7 +1085,7 @@ public class ImsPhone extends ImsPhoneBase {

		@VisibleForTesting
		public void sendErrorResponse(Message onComplete, Throwable e) {
		Rlog.d(LOG_TAG, "sendErrorResponse");
		logd("sendErrorResponse");
		if (onComplete != null) {
		AsyncResult.forMessage(onComplete, null, getCommandException(e));
		onComplete.sendToTarget();
		@@ -1099,8 +1093,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		private CommandException getCommandException(int code, String errorString) {
		Rlog.d(LOG_TAG, "getCommandException code= " + code
		+ ", errorString= " + errorString);
		logd("getCommandException code= " + code + ", errorString= " + errorString);
		CommandException.Error error = CommandException.Error.GENERIC_FAILURE;

		switch(code) {
		@@ -1141,7 +1134,7 @@ public class ImsPhone extends ImsPhoneBase {
		if (e instanceof ImsException) {
		ex = getCommandException(((ImsException)e).getCode(), e.getMessage());
		} else {
		Rlog.d(LOG_TAG, "getCommandException generic failure");
		logd("getCommandException generic failure");
		ex = new CommandException(CommandException.Error.GENERIC_FAILURE);
		}
		return ex;
		@@ -1149,14 +1142,14 @@ public class ImsPhone extends ImsPhoneBase {

		private void
		onNetworkInitiatedUssd(ImsPhoneMmiCode mmi) {
		Rlog.d(LOG_TAG, "onNetworkInitiatedUssd");
		logd("onNetworkInitiatedUssd");
		mMmiCompleteRegistrants.notifyRegistrants(
		new AsyncResult(null, mmi, null));
		}

		/* package */
		void onIncomingUSSD(int ussdMode, String ussdMessage) {
		if (DBG) Rlog.d(LOG_TAG, "onIncomingUSSD ussdMode=" + ussdMode);
		if (DBG) logd("onIncomingUSSD ussdMode=" + ussdMode);

		boolean isUssdError;
		boolean isUssdRequest;
		@@ -1208,7 +1201,7 @@ public class ImsPhone extends ImsPhoneBase {
		* The exception is cancellation of an incoming USSD-REQUEST, which is
		* not on the list.
		*/
		Rlog.d(LOG_TAG, "onMMIDone: mmi=" + mmi);
		logd("onMMIDone: mmi=" + mmi);
		if (mPendingMMIs.remove(mmi) \|\| mmi.isUssdRequest() \|\| mmi.isSsInfo()) {
		ResultReceiver receiverCallback = mmi.getUssdCallbackReceiver();
		if (receiverCallback != null) {
		@@ -1217,7 +1210,7 @@ public class ImsPhone extends ImsPhoneBase {
		sendUssdResponse(mmi.getDialString(), mmi.getMessage(), returnCode,
		receiverCallback );
		} else {
		Rlog.v(LOG_TAG, "onMMIDone: notifyRegistrants");
		logv("onMMIDone: notifyRegistrants");
		mMmiCompleteRegistrants.notifyRegistrants(
		new AsyncResult(null, mmi, null));
		}
		@@ -1369,7 +1362,7 @@ public class ImsPhone extends ImsPhoneBase {
		ServiceState ss = mDefaultPhone.getServiceStateTracker().mSS;
		mSS.setDataRegState(ss.getDataRegState());
		mSS.setRilDataRadioTechnology(ss.getRilDataRadioTechnology());
		Rlog.d(LOG_TAG, "updateDataServiceState: defSs = " + ss + " imsSs = " + mSS);
		logd("updateDataServiceState: defSs = " + ss + " imsSs = " + mSS);
		}
		}

		@@ -1377,7 +1370,7 @@ public class ImsPhone extends ImsPhoneBase {
		public void handleMessage(Message msg) {
		AsyncResult ar = (AsyncResult) msg.obj;

		if (DBG) Rlog.d(LOG_TAG, "handleMessage what=" + msg.what);
		if (DBG) logd("handleMessage what=" + msg.what);
		switch (msg.what) {
		case EVENT_SET_CALL_FORWARD_DONE:
		IccRecords r = mDefaultPhone.getIccRecords();
		@@ -1429,22 +1422,22 @@ public class ImsPhone extends ImsPhoneBase {
		break;

		case EVENT_DEFAULT_PHONE_DATA_STATE_CHANGED:
		if (DBG) Rlog.d(LOG_TAG, "EVENT_DEFAULT_PHONE_DATA_STATE_CHANGED");
		if (DBG) logd("EVENT_DEFAULT_PHONE_DATA_STATE_CHANGED");
		updateDataServiceState();
		break;

		case EVENT_SERVICE_STATE_CHANGED:
		if (VDBG) Rlog.d(LOG_TAG, "EVENT_SERVICE_STATE_CHANGED");
		if (VDBG) logd("EVENT_SERVICE_STATE_CHANGED");
		ar = (AsyncResult) msg.obj;
		ServiceState newServiceState = (ServiceState) ar.result;
		// only update if roaming status changed
		if (mRoaming != newServiceState.getRoaming()) {
		if (DBG) Rlog.d(LOG_TAG, "Roaming state changed");
		if (DBG) logd("Roaming state changed");
		updateRoamingState(newServiceState.getRoaming());
		}
		break;
		case EVENT_VOICE_CALL_ENDED:
		if (DBG) Rlog.d(LOG_TAG, "Voice call ended. Handle pending updateRoamingState.");
		if (DBG) logd("Voice call ended. Handle pending updateRoamingState.");
		mCT.unregisterForVoiceCallEnded(this);
		// only update if roaming status changed
		boolean newRoaming = getCurrentRoaming();
		@@ -1466,13 +1459,13 @@ public class ImsPhone extends ImsPhoneBase {
		new ImsEcbmStateListener() {
		@Override
		public void onECBMEntered() {
		if (DBG) Rlog.d(LOG_TAG, "onECBMEntered");
		if (DBG) logd("onECBMEntered");
		handleEnterEmergencyCallbackMode();
		}

		@Override
		public void onECBMExited() {
		if (DBG) Rlog.d(LOG_TAG, "onECBMExited");
		if (DBG) logd("onECBMExited");
		handleExitEmergencyCallbackMode();
		}
		};
		@@ -1493,7 +1486,7 @@ public class ImsPhone extends ImsPhoneBase {
		intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());
		SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
		ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
		if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallbackModeChange: isInEcm=" + isInEcm());
		if (DBG) logd("sendEmergencyCallbackModeChange: isInEcm=" + isInEcm());
		}

		@Override
		@@ -1501,7 +1494,7 @@ public class ImsPhone extends ImsPhoneBase {
		if (mWakeLock.isHeld()) {
		mWakeLock.release();
		}
		if (DBG) Rlog.d(LOG_TAG, "exitEmergencyCallbackMode()");
		if (DBG) logd("exitEmergencyCallbackMode()");

		// Send a message which will invoke handleExitEmergencyCallbackMode
		ImsEcbm ecbm;
		@@ -1514,10 +1507,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		private void handleEnterEmergencyCallbackMode() {
		if (DBG) {
		Rlog.d(LOG_TAG, "handleEnterEmergencyCallbackMode,mIsPhoneInEcmState= "
		+ isInEcm());
		}
		if (DBG) logd("handleEnterEmergencyCallbackMode,mIsPhoneInEcmState= " + isInEcm());
		// if phone is not in Ecm mode, and it's changed to Ecm mode
		if (!isInEcm()) {
		setIsInEcm(true);
		@@ -1536,10 +1526,7 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		protected void handleExitEmergencyCallbackMode() {
		if (DBG) {
		Rlog.d(LOG_TAG, "handleExitEmergencyCallbackMode: mIsPhoneInEcmState = "
		+ isInEcm());
		}
		if (DBG) logd("handleExitEmergencyCallbackMode: mIsPhoneInEcmState = " + isInEcm());

		if (isInEcm()) {
		setIsInEcm(false);
		@@ -1580,7 +1567,7 @@ public class ImsPhone extends ImsPhoneBase {
		((GsmCdmaPhone) mDefaultPhone).notifyEcbmTimerReset(Boolean.FALSE);
		break;
		default:
		Rlog.e(LOG_TAG, "handleTimerInEmergencyCallbackMode, unsupported action " + action);
		loge("handleTimerInEmergencyCallbackMode, unsupported action " + action);
		}
		}

		@@ -1704,12 +1691,12 @@ public class ImsPhone extends ImsPhoneBase {
		CarrierConfigManager configManager =
		(CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
		if (configManager == null) {
		Rlog.e(LOG_TAG, "processDisconnectReason: CarrierConfigManager is not ready");
		loge("processDisconnectReason: CarrierConfigManager is not ready");
		return;
		}
		PersistableBundle pb = configManager.getConfigForSubId(getSubId());
		if (pb == null) {
		Rlog.e(LOG_TAG, "processDisconnectReason: no config for subId " + getSubId());
		loge("processDisconnectReason: no config for subId " + getSubId());
		return;
		}
		final String[] wfcOperatorErrorCodes =
		@@ -1730,7 +1717,7 @@ public class ImsPhone extends ImsPhoneBase {
		for (int i = 0; i < wfcOperatorErrorCodes.length; i++) {
		String[] codes = wfcOperatorErrorCodes[i].split("\\\|");
		if (codes.length != 2) {
		Rlog.e(LOG_TAG, "Invalid carrier config: " + wfcOperatorErrorCodes[i]);
		loge("Invalid carrier config: " + wfcOperatorErrorCodes[i]);
		continue;
		}

		@@ -1761,7 +1748,7 @@ public class ImsPhone extends ImsPhoneBase {
		if (idx < 0
		\|\| idx >= wfcOperatorErrorAlertMessages.length
		\|\| idx >= wfcOperatorErrorNotificationMessages.length) {
		Rlog.e(LOG_TAG, "Invalid index: " + wfcOperatorErrorCodes[i]);
		loge("Invalid index: " + wfcOperatorErrorCodes[i]);
		continue;
		}
		String messageAlert = imsReasonInfo.mExtraMessage;
		@@ -1822,12 +1809,12 @@ public class ImsPhone extends ImsPhoneBase {

		private void updateRoamingState(boolean newRoaming) {
		if (mCT.getState() == PhoneConstants.State.IDLE) {
		if (DBG) Rlog.d(LOG_TAG, "updateRoamingState now: " + newRoaming);
		if (DBG) logd("updateRoamingState now: " + newRoaming);
		mRoaming = newRoaming;
		ImsManager imsManager = ImsManager.getInstance(mContext, mPhoneId);
		imsManager.setWfcMode(imsManager.getWfcMode(newRoaming), newRoaming);
		} else {
		if (DBG) Rlog.d(LOG_TAG, "updateRoamingState postponed: " + newRoaming);
		if (DBG) logd("updateRoamingState postponed: " + newRoaming);
		mCT.registerForVoiceCallEnded(this,
		EVENT_VOICE_CALL_ENDED, null);
		}
		@@ -1859,4 +1846,20 @@ public class ImsPhone extends ImsPhoneBase {
		pw.println(" mSsnRegistrants = " + mSsnRegistrants);
		pw.flush();
		}

		private void logi(String s) {
		Rlog.i(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		private void logv(String s) {
		Rlog.v(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		private void logd(String s) {
		Rlog.d(LOG_TAG, "[" + mPhoneId + "] " + s);
		}

		private void loge(String s) {
		Rlog.e(LOG_TAG, "[" + mPhoneId + "] " + s);
		}
		}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.Connection;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.PhoneInternalInterface;
		import com.android.internal.telephony.SubscriptionController;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.dataconnection.DataEnabledSettings;
		@@ -3106,11 +3105,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {

		@Override
		protected void log(String msg) {
		Rlog.d(LOG_TAG, "[ImsPhoneCallTracker] " + msg);
		Rlog.d(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);
		}

		protected void loge(String msg) {
		Rlog.e(LOG_TAG, "[ImsPhoneCallTracker] " + msg);
		Rlog.e(LOG_TAG, "[" + mPhone.getPhoneId() + "] " + msg);
		}

		/**