merge in lmp-mr1-release history after reset to 31f19e6271e53f7fb359866bd32a8b6a3d47d115
The Android Automerger [Sat, 11 Oct 2014 13:10:25 +0000 (06:10 -0700)]
src/java/com/android/ims/ImsManager.java
src/java/com/android/ims/internal/ImsCallSession.java

index 24609d0..95a599c 100644 (file)
@@ -502,6 +502,19 @@ public class ImsManager {
         return mConfig;
     }
 
+    public void setUiTTYMode(int serviceId, int uiTtyMode, Message onComplete)
+            throws ImsException {
+
+       checkAndThrowExceptionIfServiceUnavailable();
+
+       try {
+           mImsService.setUiTTYMode(serviceId, uiTtyMode, onComplete);
+       } catch (RemoteException e) {
+           throw new ImsException("setTTYMode()", e,
+                   ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
+       }
+    }
+
     /**
      * Gets the call ID from the specified incoming call broadcast intent.
      *
index 2871052..bfc29d5 100644 (file)
@@ -1051,5 +1051,17 @@ public class ImsCallSession {
                         targetAccessTech, reasonInfo);
             }
         }
+
+        /**
+         * Notifies the TTY mode received from remote party.
+         */
+        @Override
+        public void callSessionTtyModeReceived(IImsCallSession session,
+                int mode) {
+            if (mListener != null) {
+                //TODO: UI specific implementation.
+                //Vendor UI can listen to this callback to take action on received TTY mode.
+            }
+        }
     }
 }