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

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

Merge "Reorder getFeatureState parameters to convention" 

am: e11ab258

Change-Id: I9b0671d59bb7503d0947d354a5e5030b20010cdb
parents f228b9b3 e11ab258

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8902,7 +8902,7 @@ package android.telephony.ims { 














  public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {















    method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>) throws android.telephony.ims.ImsException;















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiModeSetting();

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -3231,7 +3231,7 @@ package android.telephony.ims {





























  public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {















    method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);













    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getFeatureState(@NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull java.util.concurrent.Executor) throws android.telephony.ims.ImsException;













    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>) throws android.telephony.ims.ImsException;















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getVoWiFiModeSetting();

































telephony/java/android/telephony/ims/ImsMmTelManager.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -979,25 +979,25 @@ public class ImsMmTelManager implements RegistrationManager {





























    /**















     * Get the status of the MmTel Feature registered on this subscription.













     * @param executor The executor that will be used to call the callback.















     * @param callback A callback containing an Integer describing the current state of the















     *                 MmTel feature, Which will be one of the following:















     *                 {@link ImsFeature#STATE_UNAVAILABLE},















     *                {@link ImsFeature#STATE_INITIALIZING},















     *                {@link ImsFeature#STATE_READY}. Will be called using the executor















     *                 specified when the service state has been retrieved from the IMS service.













     * @param executor The executor that will be used to call the callback.















     * @throws ImsException if the IMS service associated with this subscription is not available or















     * the IMS service is not available.















     */















    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    public void getFeatureState(@NonNull @ImsFeature.ImsState Consumer<Integer> callback,













            @NonNull @CallbackExecutor Executor executor) throws ImsException {













        if (callback == null) {













            throw new IllegalArgumentException("Must include a non-null Consumer.");













        }













    public void getFeatureState(@NonNull @CallbackExecutor Executor executor,













            @NonNull @ImsFeature.ImsState Consumer<Integer> callback) throws ImsException {















        if (executor == null) {















            throw new IllegalArgumentException("Must include a non-null Executor.");















        }













        if (callback == null) {













            throw new IllegalArgumentException("Must include a non-null Consumer.");













        }















        try {















            getITelephony().getImsMmTelFeatureState(mSubId, new IIntegerConsumer.Stub() {















                @Override