PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Clean up WifiManager APIs"

Browse Source
This commit is contained in:
David Su
2019-11-18 21:03:41 +00:00
committed by Android (Google) Code Review
parent c33db384d0 d4f077f1e2
commit 68e501f80e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/NetworkRequestDialogActivity.java
View File

@@ -26,12 +26,16 @@ import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback; import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.Message; import android.os.Message;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import java.util.List; import java.util.List;
/** /**
@@ -115,7 +119,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
final WifiManager wifiManager = getSystemService(WifiManager.class); final WifiManager wifiManager = getSystemService(WifiManager.class);
if (wifiManager != null) { if (wifiManager != null) {
wifiManager.registerNetworkRequestMatchCallback(this, mHandler); wifiManager.registerNetworkRequestMatchCallback(new HandlerExecutor(mHandler), this);
} }
// Sets time-out to stop scanning. // Sets time-out to stop scanning.
mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS); mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);

6
src/com/android/settings/wifi/RequestToggleWiFiActivity.java
View File

@@ -29,7 +29,6 @@ import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -313,11 +312,6 @@ public class RequestToggleWiFiActivity extends AlertActivity
finish(); finish();
} }
} break; } break;
case WifiManager.ERROR: {
Toast.makeText(activity, R.string.wifi_error, Toast.LENGTH_SHORT).show();
finish();
} break;
} }
} }
} }