IMS: Fix video call forwarding options issue

Service class received from the lower layers is not getting
updated properly.

Change-Id: Ic80d56efedd791e3909f51efca63770346049814
CRs-Fixed: 901774

2 files changed, 10 insertions, 0 deletions

diff --git a/telephony/java/com/android/ims/ImsCallForwardInfo.java b/telephony/java/com/android/ims/ImsCallForwardInfo.java
index 3f8fd19..97dcbd5 100644
--- a/telephony/java/com/android/ims/ImsCallForwardInfo.java
+++ b/telephony/java/com/android/ims/ImsCallForwardInfo.java
@@ -31,6 +31,8 @@ public class ImsCallForwardInfo implements Parcelable {
     public int mStatus;
     // 0x91: International, 0x81: Unknown
     public int mToA;
+    // Service class
+    public int mServiceClass;
     // Number (it will not include the "sip" or "tel" URI scheme)
     public String mNumber;
     // No reply timer for CF
@@ -53,6 +55,7 @@ public class ImsCallForwardInfo implements Parcelable {
         out.writeInt(mCondition);
         out.writeInt(mStatus);
         out.writeInt(mToA);
+        out.writeInt(mServiceClass);
         out.writeString(mNumber);
         out.writeInt(mTimeSeconds);
     }
@@ -62,6 +65,7 @@ public class ImsCallForwardInfo implements Parcelable {
         return super.toString() + ", Condition: " + mCondition
             + ", Status: " + ((mStatus == 0) ? "disabled" : "enabled")
             + ", ToA: " + mToA + ", Number=" + mNumber
+            + ", Service Class: " + mServiceClass
             + ", Time (seconds): " + mTimeSeconds;
     }
 
@@ -69,6 +73,7 @@ public class ImsCallForwardInfo implements Parcelable {
         mCondition = in.readInt();
         mStatus = in.readInt();
         mToA = in.readInt();
+        mServiceClass = in.readInt();
         mNumber = in.readString();
         mTimeSeconds = in.readInt();
     }
diff --git a/telephony/java/com/android/ims/internal/IImsUt.aidl b/telephony/java/com/android/ims/internal/IImsUt.aidl
index 4ab5ee3..2784653 100644
--- a/telephony/java/com/android/ims/internal/IImsUt.aidl
+++ b/telephony/java/com/android/ims/internal/IImsUt.aidl
@@ -111,4 +111,9 @@ interface IImsUt {
      * Sets the listener.
      */
     void setListener(in IImsUtListener listener);
+
+    /**
+     * Retrieves the configuration of the call forward for specified service class.
+     */
+    int queryCFForServiceClass(int condition, String number, int serviceClass);
 }