Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10cbfa71 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

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

am: 9d789315

Change-Id: I31dd3f361ef8df0ef470f057730ec81d57a843ca
parents 7544d012 9d789315

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,11 @@ public final class ImsFeatureConfiguration implements Parcelable { 
            result = 31 * result + featureType;

            result = 31 * result + featureType;

            return result;

            return result;

        }

        }



        @Override

        public String toString() {

            return "{s=" + slotId + ", f=" + featureType + "}";

        }

    }

    }





    /**

    /**

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -822,6 +822,16 @@ interface ITelephony { 
     */

     */

    boolean isResolvingImsBinding();

    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.

     * Set the network selection mode to automatic.

     *

     *