Snap for 5374457 from f12260704c42bae5b40c024f7f1b673a38825737 to qt-release (fd8dcab6) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ public class RadioConfig extends Handler {
		case RIL_REQUEST_SWITCH_DUAL_SIM_CONFIG:
		return "SWITCH_DUAL_SIM_CONFIG";
		default:
		return "<unknown request>";
		return "<unknown request " + request + ">";
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ public class AccessNetworksManager extends Handler {
		intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
		phone.getContext().registerReceiverAsUser(mConfigChangedReceiver, UserHandle.ALL,
		intentFilter, null, null);
		sendEmptyMessage(EVENT_BIND_QUALIFIED_NETWORKS_SERVICE);
		}

		/**

+13 −0

Original line number	Diff line number	Diff line
		@@ -2447,6 +2447,9 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		// disconnected while processing hold
		if (mPendingMO != null) {
		dialPendingMO();
		} else if (mRingingCall.getState() == ImsPhoneCall.State.WAITING
		&& mHoldSwitchingState == HoldSwapState.HOLDING_TO_ANSWER_INCOMING) {
		sendEmptyMessage(EVENT_ANSWER_WAITING_CALL);
		}
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		} else if (mPendingMO != null && mPendingMO.isEmergency()) {
		@@ -2469,6 +2472,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		mCallExpectedToResume = null;
		}
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		} else if (mRingingCall.getState() == ImsPhoneCall.State.WAITING
		&& mHoldSwitchingState == HoldSwapState.HOLDING_TO_ANSWER_INCOMING) {
		// If we issued a hold request in order to answer an incoming call, we need
		// to tell Telecom that we can't actually answer the incoming call.
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		logHoldSwapState("onCallHoldFailed unable to answer waiting call");
		}
		ImsPhoneConnection conn = findConnection(imsCall);
		if (conn != null) {
		conn.onConnectionEvent(android.telecom.Connection.EVENT_CALL_HOLD_FAILED, null);
		}
		mPhone.notifySuppServiceFailed(Phone.SuppService.HOLD);
		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,21 @@ public class UiccController extends Handler {
		mDefaultEuiccCardId = UNINITIALIZED_CARD_ID;
		}

		/**
		* Given the slot index, return the phone ID, or -1 if no phone is associated with the given
		* slot.
		* @param slotId the slot index to check
		* @return the associated phone ID or -1
		*/
		public int getPhoneIdFromSlotId(int slotId) {
		for (int i = 0; i < mPhoneIdToSlotId.length; i++) {
		if (mPhoneIdToSlotId[i] == slotId) {
		return i;
		}
		}
		return -1;
		}

		private int getSlotIdFromPhoneId(int phoneId) {
		return mPhoneIdToSlotId[phoneId];
		}