IMS: UT ServiceClass

When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I419aca453657063941d2b9121b508a0a69a17e6a
diff --git a/src/java/com/android/ims/ImsUt.java b/src/java/com/android/ims/ImsUt.java
index 69a79e7..2152be7 100644
--- a/src/java/com/android/ims/ImsUt.java
+++ b/src/java/com/android/ims/ImsUt.java
@@ -346,16 +346,16 @@
      */
     @Override
     public void updateCallForward(int action, int condition, String number,
-            int timeSeconds, Message result) {
+            int serviceClass, int timeSeconds, Message result) {
         if (DBG) {
             log("updateCallForward :: Ut=" + miUt + ", action=" + action
                     + ", condition=" + condition + ", number=" + number
-                    + ", timeSeconds=" + timeSeconds);
+                    +  ", serviceClass=" + serviceClass + ", timeSeconds=" + timeSeconds);
         }
 
         synchronized(mLockObj) {
             try {
-                int id = miUt.updateCallForward(action, condition, number, timeSeconds);
+                int id = miUt.updateCallForward(action, condition, number, serviceClass, timeSeconds);
 
                 if (id < 0) {
                     sendFailureReport(result,
@@ -375,14 +375,15 @@
      * Modifies the configuration of the call waiting.
      */
     @Override
-    public void updateCallWaiting(boolean enable, Message result) {
+    public void updateCallWaiting(boolean enable, int serviceClass, Message result) {
         if (DBG) {
-            log("updateCallWaiting :: Ut=" + miUt + ", enable=" + enable);
+            log("updateCallWaiting :: Ut=" + miUt + ", enable=" + enable
+            + ",serviceClass="  + serviceClass);
         }
 
         synchronized(mLockObj) {
             try {
-                int id = miUt.updateCallWaiting(enable);
+                int id = miUt.updateCallWaiting(enable, serviceClass);
 
                 if (id < 0) {
                     sendFailureReport(result,
diff --git a/src/java/com/android/ims/ImsUtInterface.java b/src/java/com/android/ims/ImsUtInterface.java
index 316b5ae..fa8aef3 100644
--- a/src/java/com/android/ims/ImsUtInterface.java
+++ b/src/java/com/android/ims/ImsUtInterface.java
@@ -150,12 +150,12 @@
      * Modifies the configuration of the call forward.
      */
     public void updateCallForward(int action, int condition, String number,
-            int timeSeconds, Message result);
+            int serviceClass, int timeSeconds, Message result);
 
     /**
      * Modifies the configuration of the call waiting.
      */
-    public void updateCallWaiting(boolean enable, Message result);
+    public void updateCallWaiting(boolean enable, int serviceClass, Message result);
 
     /**
      * Updates the configuration of the CLIR supplementary service.