Merge commit '6f651e30841ff5b7576904fd45e908a6009cb7dc' into merge (957caf97) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -136,9 +136,10 @@ public class CdmaConnection extends Connection {
		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 @@ public class CdmaConnection extends Connection {
		Rlog.d(LOG_TAG, "[CDMAConn] " + msg);
		}

		private String maskDialString(String dialString) {
		if (VDBG) {
		return dialString;
		}

		return "<MASKED>";
		}

		@Override
		public int getNumberPresentation() {
		return mNumberPresentation;

src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ public final class CdmaInformationRecords {
		public String toString() {
		return "CdmaNumberInfoRec: {" +
		" id: " + CdmaInformationRecords.idToString(id) +
		", number: " + number +
		", number: <MASKED>" +
		", numberType: " + numberType +
		", numberPlan: " + numberPlan +
		", pi: " + pi +

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

+37 −12

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public class ImsPhone extends ImsPhoneBase {
		public static final String EXTRA_KEY_ALERT_TITLE = "alertTitle";
		public static final String EXTRA_KEY_ALERT_MESSAGE = "alertMessage";
		public static final String EXTRA_KEY_ALERT_SHOW = "alertShow";
		public static final String EXTRA_KEY_NOTIFICATION_MESSAGE = "notificationMessage";

		static final int RESTART_ECM_TIMER = 0; // restart Ecm timer
		static final int CANCEL_ECM_TIMER = 1; // cancel Ecm timer
		@@ -679,8 +680,18 @@ public class ImsPhone extends ImsPhoneBase {
		String dialingNumber,
		int timerSeconds,
		Message onComplete) {
		setCallForwardingOption(commandInterfaceCFAction, commandInterfaceCFReason, dialingNumber,
		CommandsInterface.SERVICE_CLASS_VOICE, timerSeconds, onComplete);
		}

		public void setCallForwardingOption(int commandInterfaceCFAction,
		int commandInterfaceCFReason,
		String dialingNumber,
		int serviceClass,
		int timerSeconds,
		Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallForwardingOption action=" + commandInterfaceCFAction
		+ ", reason=" + commandInterfaceCFReason);
		+ ", reason=" + commandInterfaceCFReason + " serviceClass=" + serviceClass);
		if ((isValidCommandInterfaceCFAction(commandInterfaceCFAction)) &&
		(isValidCommandInterfaceCFReason(commandInterfaceCFReason))) {
		Message resp;
		@@ -695,6 +706,7 @@ public class ImsPhone extends ImsPhoneBase {
		ut.updateCallForward(getActionFromCFAction(commandInterfaceCFAction),
		getConditionFromCFReason(commandInterfaceCFReason),
		dialingNumber,
		serviceClass,
		timerSeconds,
		onComplete);
		} catch (ImsException e) {
		@@ -721,13 +733,17 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void setCallWaiting(boolean enable, Message onComplete) {
		setCallWaiting(enable, CommandsInterface.SERVICE_CLASS_VOICE, onComplete);
		}

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

		try {
		ImsUtInterface ut = mCT.getUtInterface();
		ut.updateCallWaiting(enable, resp);
		ut.updateCallWaiting(enable, serviceClass, resp);
		} catch (ImsException e) {
		sendErrorResponse(onComplete, e);
		}
		@@ -1286,14 +1302,15 @@ public class ImsPhone extends ImsPhoneBase {
		// means that intent was not received by WfcSettings.

		CharSequence title = intent.getCharSequenceExtra(EXTRA_KEY_ALERT_TITLE);
		CharSequence message = intent.getCharSequenceExtra(EXTRA_KEY_ALERT_MESSAGE);
		CharSequence messageAlert = intent.getCharSequenceExtra(EXTRA_KEY_ALERT_MESSAGE);
		CharSequence messageNotification = intent.getCharSequenceExtra(EXTRA_KEY_NOTIFICATION_MESSAGE);

		Intent resultIntent = new Intent(Intent.ACTION_MAIN);
		resultIntent.setClassName("com.android.settings",
		"com.android.settings.Settings$WifiCallingSettingsActivity");
		resultIntent.putExtra(EXTRA_KEY_ALERT_SHOW, true);
		resultIntent.putExtra(EXTRA_KEY_ALERT_TITLE, title);
		resultIntent.putExtra(EXTRA_KEY_ALERT_MESSAGE, message);
		resultIntent.putExtra(EXTRA_KEY_ALERT_MESSAGE, messageAlert);
		PendingIntent resultPendingIntent =
		PendingIntent.getActivity(
		mContext,
		@@ -1306,10 +1323,10 @@ public class ImsPhone extends ImsPhoneBase {
		new Notification.Builder(mContext)
		.setSmallIcon(android.R.drawable.stat_sys_warning)
		.setContentTitle(title)
		.setContentText(message)
		.setContentText(messageNotification)
		.setAutoCancel(true)
		.setContentIntent(resultPendingIntent)
		.setStyle(new Notification.BigTextStyle().bigText(message))
		.setStyle(new Notification.BigTextStyle().bigText(messageNotification))
		.build();
		final String notificationTag = "wifi_calling";
		final int notificationId = 1;
		@@ -1333,9 +1350,12 @@ public class ImsPhone extends ImsPhoneBase {
		final String[] wfcOperatorErrorCodes =
		mContext.getResources().getStringArray(
		com.android.internal.R.array.wfcOperatorErrorCodes);
		final String[] wfcOperatorErrorMessages =
		final String[] wfcOperatorErrorAlertMessages =
		mContext.getResources().getStringArray(
		com.android.internal.R.array.wfcOperatorErrorMessages);
		com.android.internal.R.array.wfcOperatorErrorAlertMessages);
		final String[] wfcOperatorErrorNotificationMessages =
		mContext.getResources().getStringArray(
		com.android.internal.R.array.wfcOperatorErrorNotificationMessages);

		for (int i = 0; i < wfcOperatorErrorCodes.length; i++) {
		// Match error code.
		@@ -1361,9 +1381,13 @@ public class ImsPhone extends ImsPhoneBase {
		final CharSequence title = mContext.getText(
		com.android.internal.R.string.wfcRegErrorTitle);

		CharSequence message = imsReasonInfo.mExtraMessage;
		if (!wfcOperatorErrorMessages[i].isEmpty()) {
		message = wfcOperatorErrorMessages[i];
		CharSequence messageAlert = imsReasonInfo.mExtraMessage;
		CharSequence messageNotification = imsReasonInfo.mExtraMessage;
		if (!wfcOperatorErrorAlertMessages[i].isEmpty()) {
		messageAlert = wfcOperatorErrorAlertMessages[i];
		}
		if (!wfcOperatorErrorNotificationMessages[i].isEmpty()) {
		messageNotification = wfcOperatorErrorNotificationMessages[i];
		}

		// UX requirement is to disable WFC in case of "permanent" registration failures.
		@@ -1373,7 +1397,8 @@ public class ImsPhone extends ImsPhoneBase {
		// otherwise notification will be added.
		Intent intent = new Intent(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
		intent.putExtra(EXTRA_KEY_ALERT_TITLE, title);
		intent.putExtra(EXTRA_KEY_ALERT_MESSAGE, message);
		intent.putExtra(EXTRA_KEY_ALERT_MESSAGE, messageAlert);
		intent.putExtra(EXTRA_KEY_NOTIFICATION_MESSAGE, messageNotification);
		mContext.sendOrderedBroadcast(intent, null, mResultReceiver,
		null, Activity.RESULT_OK, null, null);

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -706,10 +706,10 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		throw new CallStateException(ImsPhone.CS_FALLBACK);
		} else if (isServiceCodeCallForwarding(mSc)) {
		Rlog.d(LOG_TAG, "is CF");
		// service group is not supported

		String dialingNumber = mSia;
		int reason = scToCallForwardReason(mSc);
		int serviceClass = siToServiceClass(mSib);
		int time = siToTime(mSic);

		if (isInterrogate()) {
		@@ -750,7 +750,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {

		Rlog.d(LOG_TAG, "is CF setCallForward");
		mPhone.setCallForwardingOption(cfAction, reason,
		dialingNumber, time, obtainMessage(
		dialingNumber, serviceClass, time, obtainMessage(
		EVENT_SET_CFF_COMPLETE,
		isSettingUnconditional,
		isEnableDesired, this));
		@@ -890,9 +890,10 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		}
		} else if (mSc != null && mSc.equals(SC_WAIT)) {
		// sia = basic service group
		// service group is not supported
		int serviceClass = siToServiceClass(mSib);

		if (isActivate() \|\| isDeactivate()) {
		mPhone.setCallWaiting(isActivate(),
		mPhone.setCallWaiting(isActivate(), serviceClass,
		obtainMessage(EVENT_SET_COMPLETE, this));
		} else if (isInterrogate()) {
		mPhone.getCallWaiting(obtainMessage(EVENT_QUERY_COMPLETE, this));