Add ServiceStatus class for uniform capability handling

Add ServiceStatus class to support different access tech and
create uniform way of storing information for local/peer ability
and service status updates

Change-Id: I418c273e8b7f4cd5912e9b9cde85e9d83419cbf4
CRs-Fixed: 639446

1 files changed, 12 insertions, 16 deletions

diff --git a/src/java/com/android/internal/telephony/CallDetails.java b/src/java/com/android/internal/telephony/CallDetails.java
index ee57dc46e..e447bc5ab 100644
--- a/src/java/com/android/internal/telephony/CallDetails.java
+++ b/src/java/com/android/internal/telephony/CallDetails.java
@@ -171,18 +171,6 @@ public class CallDetails {
     public String[] extras;
     private int mVideoPauseState = VIDEO_PAUSE_STATE_RESUMED;
 
-    public static class ServiceStatus {
-        public boolean isValid;
-        public int type;
-        public int status;
-        public byte[] userdata;
-        public int restrictCause;
-
-        public ServiceStatus() {
-            this.isValid = false;
-        }
-    }
-
     public ServiceStatus[] localAbility;
     public ServiceStatus[] peerAbility;
 
@@ -277,8 +265,12 @@ public class CallDetails {
             for (ServiceStatus srv : localAbility) {
                 if (srv != null) {
                     localSrvAbility += "isValid = " + srv.isValid + " type = "
-                            + srv.type + " status = " + srv.status + " restrictCause = "
-                            + srv.restrictCause;
+                            + srv.type + " status = " + srv.status;
+                    if (srv.accessTechStatus != null) {
+                        for(ServiceStatus.StatusForAccessTech at : srv.accessTechStatus) {
+                                localSrvAbility += " accTechStatus " + at;
+                        }
+                    }
                 }
             }
         }
@@ -287,8 +279,12 @@ public class CallDetails {
             for (ServiceStatus srv : peerAbility) {
                 if (srv != null) {
                     peerSrvAbility += "isValid = " + srv.isValid + " type = "
-                            + srv.type + " status = " + srv.status + " restrictCause = "
-                            + srv.restrictCause;
+                            + srv.type + " status = " + srv.status;
+                    if (srv.accessTechStatus != null) {
+                        for(ServiceStatus.StatusForAccessTech at : srv.accessTechStatus) {
+                                peerSrvAbility += " accTechStatus " + at;
+                        }
+                    }
                 }
             }
         }