Merge "Revert submission" (33ed72d2) · Commits · e / os / android_packages_services_Telecomm

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

+28 −5

Original line number	Diff line number	Diff line
		@@ -1187,8 +1187,10 @@ public class CallsManager extends Call.ListenerBase
		}
		}

		if (extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		Log.i(this, "Incoming call requesting RTT");
		boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);
		if (isRttSettingOn \|\|
		extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		Log.i(this, "Incoming call requesting RTT, rtt setting is %b", isRttSettingOn);
		call.createRttStreams();
		// Even if the phone account doesn't support RTT yet, the connection manager might
		// change that. Set this to check it later.
		@@ -1636,9 +1638,12 @@ public class CallsManager extends Call.ListenerBase

		boolean isVoicemail = isVoicemail(callToUse.getHandle(), accountToUse);

		if (!isVoicemail && extras != null
		&& extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
		Log.d(this, "Outgoing call requesting RTT");
		boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);
		if (!isVoicemail && (isRttSettingOn \|\| (extras != null
		&& extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT,
		false)))) {
		Log.d(this, "Outgoing call requesting RTT, rtt setting is %b",
		isRttSettingOn);
		if (callToUse.isEmergencyCall() \|\| (accountToUse != null
		&& accountToUse.hasCapabilities(PhoneAccount.CAPABILITY_RTT))) {
		// If the call requested RTT and it's an emergency call, ignore the
		@@ -2515,6 +2520,24 @@ public class CallsManager extends Call.ListenerBase
		mProximitySensorManager.turnOff(screenOnImmediately);
		}

		private boolean isRttSettingOn(PhoneAccountHandle handle) {
		boolean isRttModeSettingOn = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.RTT_CALLING_MODE, 0) != 0;
		// If the carrier config says that we should ignore the RTT mode setting from the user,
		// assume that it's off (i.e. only make an RTT call if it's requested through the extra).
		boolean shouldIgnoreRttModeSetting = getCarrierConfigForPhoneAccount(handle)
		.getBoolean(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);
		return isRttModeSettingOn && !shouldIgnoreRttModeSetting;
		}

		private PersistableBundle getCarrierConfigForPhoneAccount(PhoneAccountHandle handle) {
		int subscriptionId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(handle);
		CarrierConfigManager carrierConfigManager =
		mContext.getSystemService(CarrierConfigManager.class);
		PersistableBundle result = carrierConfigManager.getConfigForSubId(subscriptionId);
		return result == null ? new PersistableBundle() : result;
		}

		void phoneAccountSelected(Call call, PhoneAccountHandle account, boolean setDefault) {
		if (!mCalls.contains(call)) {
		Log.i(this, "Attempted to add account to unknown call %s", call);