commit b44030d8ae36b87c19660cd6184001944b31de59
author Basudev Achary Konderpu <bkonde@codeaurora.org> Tue Sep 09 11:01:49 2014 +0530
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:34:17 2014 -0700
tree 1f587ca09684bd1ffee53cad867ed4037c837f21
parent d13172e0d71bf270ed78eba74c1203bbdd9d6b82

IMS: CallForward Unconditional Timer

1) Added new API for callforward
   unconditional timer in aidl file.
2) Added new flag members in ImsCallForwardInfo,
   which has been defined in proto file.

Change-Id: Ie4b79dd2cd47b8042ff588b0f3ddfd7e72a7aab0
CRs-Fixed: 689110

telephony/java/com/android/ims/ImsCallForwardInfo.java

diff --git a/telephony/java/com/android/ims/ImsCallForwardInfo.java b/telephony/java/com/android/ims/ImsCallForwardInfo.java
index 3f8fd19..fa94a90 100644
--- a/telephony/java/com/android/ims/ImsCallForwardInfo.java
+++ b/telephony/java/com/android/ims/ImsCallForwardInfo.java
@@ -35,6 +35,14 @@
     public String mNumber;
     // No reply timer for CF
     public int mTimeSeconds;
+    // CFU start hour
+    public int mStartHour;
+    //CFU start minute
+    public int mStartMinute;
+    // CFU end hour
+    public int mEndHour;
+    //CFU end minute
+    public int mEndMinute;
 
     public ImsCallForwardInfo() {
     }
@@ -55,6 +63,10 @@
         out.writeInt(mToA);
         out.writeString(mNumber);
         out.writeInt(mTimeSeconds);
+        out.writeInt(mStartHour);
+        out.writeInt(mStartMinute);
+        out.writeInt(mEndHour);
+        out.writeInt(mEndMinute);
     }
 
     @Override
@@ -62,7 +74,11 @@
         return super.toString() + ", Condition: " + mCondition
             + ", Status: " + ((mStatus == 0) ? "disabled" : "enabled")
             + ", ToA: " + mToA + ", Number=" + mNumber
-            + ", Time (seconds): " + mTimeSeconds;
+            + ", Time (seconds): " + mTimeSeconds
+            + ", StartHour : " + mStartHour
+            + ", StartMinute : " + mStartMinute
+            + ", EndHour : " + mEndMinute
+            + ", EndMinute : " + mEndMinute;
     }
 
     private void readFromParcel(Parcel in) {
@@ -71,6 +87,10 @@
         mToA = in.readInt();
         mNumber = in.readString();
         mTimeSeconds = in.readInt();
+        mStartHour = in.readInt();
+        mStartMinute = in.readInt();
+        mEndHour = in.readInt();
+        mEndMinute = in.readInt();
     }
 
     public static final Creator<ImsCallForwardInfo> CREATOR =

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..e2ecc01 100644
--- a/telephony/java/com/android/ims/internal/IImsUt.aidl
+++ b/telephony/java/com/android/ims/internal/IImsUt.aidl
@@ -82,6 +82,13 @@
     int updateCallForward(int action, int condition, String number, int timeSeconds);
 
     /**
+     * Updates the configuration of the call forward unconditional timer.
+     */
+    int updateCallForwardUncondTimer(int startHour, int startMinute, int endHour,
+            int endMinute, int action, int condition, String number);
+
+
+    /**
      * Updates the configuration of the call waiting.
      */
     int updateCallWaiting(boolean enable);