Merge "Add GTS test APIs for testing ImsService" into pi-dev

telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java

@@ -77,6 +77,11 @@ public final class ImsFeatureConfiguration implements Parcelable {
             result = 31 * result + featureType;
             return result;
         }
+
+        @Override
+        public String toString() {
+            return "{s=" + slotId + ", f=" + featureType + "}";
+        }
     }
 
     /**

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -828,6 +828,16 @@ interface ITelephony {
      */
     boolean isResolvingImsBinding();
 
+    /**
+    *  @return true if the ImsService to bind to for the slot id specified was set, false otherwise.
+    */
+    boolean setImsService(int slotId, boolean isCarrierImsService, String packageName);
+
+    /**
+    * @return the package name of the carrier/device ImsService associated with this slot.
+    */
+    String getImsService(int slotId, boolean isCarrierImsService);
+
     /**
      * Set the network selection mode to automatic.
      *