Merge "Hide "respond via SMS" option for non-default SMS SIM." into lmp-mr1-dev (e321383b) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/InCallController.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ public final class InCallController extends CallsManagerListenerBase {
		*
		* @param call The {@link Call} to parcel.
		* @param includeVideoProvider When {@code true}, the {@link IVideoProvider} is included in the
		* parcelled call. When {@code false}, the {@link IVideoProvider} is not included.
		* parceled call. When {@code false}, the {@link IVideoProvider} is not included.
		* @return The {@link ParcelableCall} containing all call information from the {@link Call}.
		*/
		private ParcelableCall toParcelableCall(Call call, boolean includeVideoProvider) {
		@@ -452,7 +452,10 @@ public final class InCallController extends CallsManagerListenerBase {
		int state = call.getState();
		int capabilities = call.getCallCapabilities();

		if (call.isRespondViaSmsCapable()) {
		boolean isDefaultSmsAccount =
		CallsManager.getInstance().getPhoneAccountRegistrar().isUserSelectedSmsPhoneAccount(
		call.getTargetPhoneAccount());
		if (call.isRespondViaSmsCapable() && isDefaultSmsAccount) {
		capabilities \|= PhoneCapabilities.RESPOND_VIA_TEXT;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,11 @@ public final class PhoneAccountRegistrar {
		fireDefaultOutgoingChanged();
		}

		boolean isUserSelectedSmsPhoneAccount(PhoneAccountHandle accountHandle) {
		return getSubscriptionIdForPhoneAccount(accountHandle) ==
		SubscriptionManager.getDefaultSmsSubId();
		}

		public void setSimCallManager(PhoneAccountHandle callManager) {
		if (callManager != null) {
		PhoneAccount callManagerAccount = getPhoneAccount(callManager);