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

Commit 68e501f8 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Settings: Clean up WifiManager APIs"

parents c33db384 d4f077f1
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -26,12 +26,16 @@ import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.Message;
import android.widget.Toast;

import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;

import com.android.settings.R;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;

import java.util.List;

/**
@@ -115,7 +119,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements

        final WifiManager wifiManager = getSystemService(WifiManager.class);
        if (wifiManager != null) {
            wifiManager.registerNetworkRequestMatchCallback(this, mHandler);
            wifiManager.registerNetworkRequestMatchCallback(new HandlerExecutor(mHandler), this);
        }
        // Sets time-out to stop scanning.
        mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
+0 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;

import androidx.annotation.NonNull;

@@ -313,11 +312,6 @@ public class RequestToggleWiFiActivity extends AlertActivity
                        finish();
                    }
                } break;

                case WifiManager.ERROR: {
                    Toast.makeText(activity, R.string.wifi_error, Toast.LENGTH_SHORT).show();
                    finish();
                } break;
            }
        }
    }