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

Commit 576ba432 authored by Ecco Park's avatar Ecco Park
Browse files

api-review: Add Executor and move callback to end of argument list 



Bug: 126702500
Test: verify it with R2 AP for OSU operation.
Test: unit test
Change-Id: I42639243b1f4aee52f091240ff508dfafb969b82
Signed-off-by: default avatarEcco Park <eccopark@google.com>
parent a2c829c1

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4738,7 +4738,7 @@ package android.net.wifi { 
    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsEnrolleeInitiator(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public boolean startScan(android.os.WorkSource);

    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startSubscriptionProvisioning(android.net.wifi.hotspot2.OsuProvider, android.net.wifi.hotspot2.ProvisioningCallback, @Nullable android.os.Handler);

    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startSubscriptionProvisioning(@NonNull android.net.wifi.hotspot2.OsuProvider, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.hotspot2.ProvisioningCallback);

    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void stopEasyConnectSession();

    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void updateWifiUsabilityScore(int, int, int);

    field public static final int CHANGE_REASON_ADDED = 0; // 0x0

wifi/java/android/net/wifi/WifiManager.java

+21 −16
Original line number Diff line number Diff line
@@ -4346,7 +4346,9 @@ public class WifiManager { 


    /**

     * Start subscription provisioning flow

     *

     * @param provider {@link OsuProvider} to provision with

     * @param executor the Executor on which to run the callback.

     * @param callback {@link ProvisioningCallback} for updates regarding provisioning flow

     * @hide

     */
@@ -4355,45 +4357,48 @@ public class WifiManager { 
            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD

    })

    public void startSubscriptionProvisioning(OsuProvider provider, ProvisioningCallback callback,

            @Nullable Handler handler) {

        Looper looper = (handler == null) ? Looper.getMainLooper() : handler.getLooper();

    public void startSubscriptionProvisioning(@NonNull OsuProvider provider,

            @NonNull @CallbackExecutor Executor executor, @NonNull ProvisioningCallback callback) {

        // Verify arguments

        if (executor == null) {

            throw new IllegalArgumentException("executor must not be null");

        }

        if (callback == null) {

            throw new IllegalArgumentException("callback must not be null");

        }

        try {

            mService.startSubscriptionProvisioning(provider,

                    new ProvisioningCallbackProxy(looper, callback));

                    new ProvisioningCallbackProxy(executor, callback));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Helper class to support OSU Provisioning callbacks

     */

    private static class ProvisioningCallbackProxy extends IProvisioningCallback.Stub {

        private final Handler mHandler;

        private final Executor mExecutor;

        private final ProvisioningCallback mCallback;



        ProvisioningCallbackProxy(Looper looper, ProvisioningCallback callback) {

            mHandler = new Handler(looper);

        ProvisioningCallbackProxy(Executor executor, ProvisioningCallback callback) {

            mExecutor = executor;

            mCallback = callback;

        }



        @Override

        public void onProvisioningStatus(int status) {

            mHandler.post(() -> {

                mCallback.onProvisioningStatus(status);

            });

            mExecutor.execute(() -> mCallback.onProvisioningStatus(status));

        }



        @Override

        public void onProvisioningFailure(int status) {

            mHandler.post(() -> {

                mCallback.onProvisioningFailure(status);

            });

            mExecutor.execute(() -> mCallback.onProvisioningFailure(status));

        }



        @Override

        public void onProvisioningComplete() {

            mHandler.post(() -> {

                mCallback.onProvisioningComplete();

            });

            mExecutor.execute(() -> mCallback.onProvisioningComplete());

        }

    }