Merge "Stub implementation for managing blocked numbers."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89778b9..16b1752 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -99,9 +99,6 @@
<!-- Message shown when the user tries to make a video call when already in a video call. -->
<string name ="duplicate_video_call_not_allowed">Call cannot be added at this time.</string>
- <!-- Message indicating video calls not allowed if user enabled TTY Mode -->
- <string name="video_call_not_allowed_if_tty_enabled">Please disable TTY Mode to make video calls.</string>
-
<!-- missing voicemail number -->
<!-- Title of the "Missing voicemail number" dialog -->
<string name="no_vm_number">Missing voicemail number</string>
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index f6eb131..5efab8f 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -1661,7 +1661,7 @@
if (hasMaximumLiveCalls()) {
// NOTE: If the amount of live calls changes beyond 1, this logic will probably
// have to change.
- Call liveCall = getFirstCallWithState(call, LIVE_CALL_STATES);
+ Call liveCall = getFirstCallWithState(LIVE_CALL_STATES);
Log.i(this, "makeRoomForOutgoingCall call = " + call + " livecall = " +
liveCall);
diff --git a/src/com/android/server/telecom/components/UserCallIntentProcessor.java b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
index a73a33e..65258d9 100644
--- a/src/com/android/server/telecom/components/UserCallIntentProcessor.java
+++ b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
@@ -123,15 +123,6 @@
VideoProfile.STATE_AUDIO_ONLY);
Log.d(this, "processOutgoingCallIntent videoState = " + videoState);
- if (VideoProfile.isVideo(videoState) && isTtyModeEnabled() &&
- !TelephonyUtil.shouldProcessAsEmergency(mContext, handle)) {
-
- Toast.makeText(mContext, mContext.getResources().getString(R.string.
- video_call_not_allowed_if_tty_enabled), Toast.LENGTH_SHORT).show();
- Log.d(this, "Rejecting video calls as tty is enabled");
- return;
- }
-
intent.putExtra(CallIntentProcessor.KEY_IS_PRIVILEGED_DIALER,
isDefaultOrSystemDialer(callingPackageName));
@@ -141,13 +132,6 @@
sendBroadcastToReceiver(intent);
}
- private boolean isTtyModeEnabled() {
- return (android.provider.Settings.Secure.getInt(
- mContext.getContentResolver(),
- android.provider.Settings.Secure.PREFERRED_TTY_MODE,
- TelecomManager.TTY_MODE_OFF) != TelecomManager.TTY_MODE_OFF);
- }
-
private boolean isDefaultOrSystemDialer(String callingPackageName) {
if (TextUtils.isEmpty(callingPackageName)) {
return false;