commit cf9f5a16fb9daae3a18546d601da008df1cc63c6
author Pavel Zhamaitsiak <pavelz@google.com> Wed Mar 25 23:04:21 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 25 23:04:21 2015 +0000
tree f16a33271cbeda97f5ffee0c4d8ec737a40a011b
parent 6a037241d51190368cd78bb5b3a3f4ddf4df857a
parent d3b6cbe172f429038894b1fae09fb72e8a646519

Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
automerge: d3b6cbe

* commit 'd3b6cbe172f429038894b1fae09fb72e8a646519':
  IMS: UT ServiceClass

telephony/java/com/android/ims/internal/IImsUt.aidl

diff --git a/telephony/java/com/android/ims/internal/IImsUt.aidl b/telephony/java/com/android/ims/internal/IImsUt.aidl
index 50a0169..c531ea5 100644
--- a/telephony/java/com/android/ims/internal/IImsUt.aidl
+++ b/telephony/java/com/android/ims/internal/IImsUt.aidl
@@ -79,12 +79,13 @@
     /**
      * Updates the configuration of the call forward.
      */
-    int updateCallForward(int action, int condition, String number, int timeSeconds);
+    int updateCallForward(int action, int condition, String number,
+            int serviceClass, int timeSeconds);
 
     /**
      * Updates the configuration of the call waiting.
      */
-    int updateCallWaiting(boolean enable);
+    int updateCallWaiting(boolean enable, int serviceClass);
 
     /**
      * Updates the configuration of the CLIR supplementary service.