commit a2ed2bbd83c1c7f9461936bba8a97d2252cf343e
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 20 09:45:06 2015 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Mar 20 09:45:06 2015 -0700
tree 0ea5507917c9cde67ad8243485d8dd878618a385
parent a90fac2e36e9a8d6d754b7189b3116c1cabbf8d2
parent 3bcd9f393828e43c5576e969ed4579968f8d9370

Merge AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.01.00.081.006 on remote branch

Change-Id: I9c20ce0f37ec734a799c61ee3a95ff28536f0d4a

src/java/com/android/ims/ImsCall.java

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
old mode 100644
new mode 100755
index 23e3dc2..0a98d8e
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -2893,40 +2893,6 @@
             }
         }
 
-        @Override
-        public void callSessionTtyModeReceived(ImsCallSession session, int mode) {
-            if (DBG) {
-                log("callSessionTtyModeReceived :: session=" + session
-                        + ", mode=" + mode);
-            }
-
-            int settingsTtyMode = Settings.Secure.getInt(
-                    mContext.getContentResolver(),
-                    Settings.Secure.PREFERRED_TTY_MODE,
-                    TelecomManager.TTY_MODE_OFF);
-            if (settingsTtyMode == TelecomManager.TTY_MODE_OFF) {
-                // Notify the user that TTY mode changed in the far device
-                int resId = 0;
-                switch (mode) {
-                    case TelecomManager.TTY_MODE_FULL:
-                        resId = com.android.internal.R.string.peerTtyModeFull;
-                        break;
-                    case TelecomManager.TTY_MODE_HCO:
-                        resId = com.android.internal.R.string.peerTtyModeHco;
-                        break;
-                    case TelecomManager.TTY_MODE_VCO:
-                        resId = com.android.internal.R.string.peerTtyModeVco;
-                        break;
-                    case TelecomManager.TTY_MODE_OFF:
-                        resId = com.android.internal.R.string.peerTtyModeOff;
-                        break;
-                }
-                if (resId != 0) {
-                    Toast.makeText(mContext, resId, Toast.LENGTH_SHORT).show();
-                }
-            }
-        }
-    
         public void callSessionHandover(ImsCallSession session, int srcAccessTech,
             int targetAccessTech, ImsReasonInfo reasonInfo) {
             if (DBG) {
@@ -2975,6 +2941,40 @@
                 }
             }
         }
+
+        @Override
+        public void callSessionTtyModeReceived(ImsCallSession session, int mode) {
+            if (DBG) {
+                log("callSessionTtyModeReceived :: session=" + session
+                        + ", mode=" + mode);
+            }
+
+            int settingsTtyMode = Settings.Secure.getInt(
+                    mContext.getContentResolver(),
+                    Settings.Secure.PREFERRED_TTY_MODE,
+                    TelecomManager.TTY_MODE_OFF);
+            if (settingsTtyMode == TelecomManager.TTY_MODE_OFF) {
+                // Notify the user that TTY mode changed in the far device
+                int resId = 0;
+                switch (mode) {
+                    case TelecomManager.TTY_MODE_FULL:
+                        resId = com.android.internal.R.string.peerTtyModeFull;
+                        break;
+                    case TelecomManager.TTY_MODE_HCO:
+                        resId = com.android.internal.R.string.peerTtyModeHco;
+                        break;
+                    case TelecomManager.TTY_MODE_VCO:
+                        resId = com.android.internal.R.string.peerTtyModeVco;
+                        break;
+                    case TelecomManager.TTY_MODE_OFF:
+                        resId = com.android.internal.R.string.peerTtyModeOff;
+                        break;
+                }
+                if (resId != 0) {
+                    Toast.makeText(mContext, resId, Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
     }
 
     /**