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

Commit a1002ca2 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Change OutcomeReceiver<Boolean> to OutcomeReceiver<Void> 

Bug: 384876570
Test: atest SatelliteManagerTestOnMockService
FLAG: com.android.internal.telephony.flags.satellite_system_apis
Change-Id: I50362932970b8e9a792a9267822e8899b1d73ae7
parent 10bdc1d1

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18568,13 +18568,13 @@ package android.telephony.satellite { 














  @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") public final class SatelliteManager {















    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void addAttachRestrictionForCarrier(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionService(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public java.util.Set<java.lang.Integer> getAttachRestrictionReasonsForCarrier(int);















    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int[] getSatelliteDisallowedReasons();















    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public java.util.List<java.lang.String> getSatellitePlmnsForCarrier(int);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void pollPendingDatagrams(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionService(@NonNull String, @NonNull byte[], @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCapabilitiesChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);















    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCommunicationAccessStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCommunicationAccessStateCallback);

























telephony/java/android/telephony/satellite/SatelliteManager.java



+9
−9




























Original line number
Diff line number
Diff line








@@ -3690,8 +3690,8 @@ public final class SatelliteManager {













     * @param list The list of provisioned satellite subscriber infos.















     * @param executor The executor on which the callback will be called.















     * @param callback The callback object to which the result will be delivered.













     *                 If the request is successful, {@link OutcomeReceiver#onResult(Object)}













     *                 will return {@code true}.













     *                 If the request is successful, {@link OutcomeReceiver#onResult}













     *                 will be called.















     *                 If the request is not successful,















     *                 {@link OutcomeReceiver#onError(Throwable)} will return an error with















     *                 a SatelliteException.









@@ -3704,7 +3704,7 @@ public final class SatelliteManager {













    @FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)















    public void provisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,















            @NonNull @CallbackExecutor Executor executor,













            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {













            @NonNull OutcomeReceiver<Void, SatelliteException> callback) {















        Objects.requireNonNull(executor);















        Objects.requireNonNull(callback);

























@@ -3718,8 +3718,8 @@ public final class SatelliteManager {













                            if (resultData.containsKey(KEY_PROVISION_SATELLITE_TOKENS)) {















                                boolean isUpdated =















                                        resultData.getBoolean(KEY_PROVISION_SATELLITE_TOKENS);













                                executor.execute(() -> Binder.withCleanCallingIdentity(() ->













                                        callback.onResult(isUpdated)));













                                executor.execute(() -> Binder.withCleanCallingIdentity(













                                        () -> callback.onResult(null)));















                            } else {















                                loge("KEY_REQUEST_PROVISION_TOKENS does not exist.");















                                executor.execute(() -> Binder.withCleanCallingIdentity(() ->










@@ -3751,8 +3751,8 @@ public final class SatelliteManager {













     * @param list The list of deprovisioned satellite subscriber infos.















     * @param executor The executor on which the callback will be called.















     * @param callback The callback object to which the result will be delivered.













     *                 If the request is successful, {@link OutcomeReceiver#onResult(Object)}













     *                 will return {@code true}.













     *                 If the request is successful, {@link OutcomeReceiver#onResult}













     *                 will be called.















     *                 If the request is not successful,















     *                 {@link OutcomeReceiver#onError(Throwable)} will return an error with















     *                 a SatelliteException.









@@ -3765,7 +3765,7 @@ public final class SatelliteManager {













    @FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)















    public void deprovisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,















            @NonNull @CallbackExecutor Executor executor,













            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {













            @NonNull OutcomeReceiver<Void, SatelliteException> callback) {















        Objects.requireNonNull(executor);















        Objects.requireNonNull(callback);

























@@ -3780,7 +3780,7 @@ public final class SatelliteManager {













                                boolean isUpdated =















                                        resultData.getBoolean(KEY_DEPROVISION_SATELLITE_TOKENS);















                                executor.execute(() -> Binder.withCleanCallingIdentity(() ->













                                        callback.onResult(isUpdated)));













                                        callback.onResult(null)));















                            } else {















                                loge("KEY_DEPROVISION_SATELLITE_TOKENS does not exist.");















                                executor.execute(() -> Binder.withCleanCallingIdentity(() ->