commit 179cc901ae015197cfa2f30b9aecde4e4b57c1e7
author Tyler Gunn <tgunn@google.com> Wed Feb 03 23:12:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 03 23:12:16 2016 +0000
tree b2a44e919e59cede89ade96dc98c8049fcfe308c
parent 08bae45180c6b29db26bac4ed37f44084b1ed77a
parent 944a0f58419730e0071b1775ed73a63c5b88253c

Merge "IMS: Update user preferred TTY mode always for UI TTY setting" into mm-wireless-dev
am: 944a0f5841

* commit '944a0f58419730e0071b1775ed73a63c5b88253c':
  IMS: Update user preferred TTY mode always for UI TTY setting

src/com/android/services/telephony/TtyManager.java

diff --git a/src/com/android/services/telephony/TtyManager.java b/src/com/android/services/telephony/TtyManager.java
index a3aeeb2..3389ce8 100644
--- a/src/com/android/services/telephony/TtyManager.java
+++ b/src/com/android/services/telephony/TtyManager.java
@@ -23,6 +23,7 @@
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings;
 import android.telecom.TelecomManager;
 
 import com.android.internal.telephony.Phone;
@@ -83,6 +84,9 @@
             ttyMode = telecomManager.getCurrentTtyMode();
         }
         updateTtyMode(ttyMode);
+        //Get preferred TTY mode from data base as UI Tty mode is always user preferred Tty mode.
+        ttyMode = Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.PREFERRED_TTY_MODE, TelecomManager.TTY_MODE_OFF);
         updateUiTtyMode(ttyMode);
     }