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

Merge "Show Error dialog when WPS is interrupted"

Browse Source 
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
This commit is contained in:
Ryusuke Sawa
2017-07-27 18:21:19 +00:00
committed by android-build-merger
parent dfe237f2cf fd7dec5d4a
commit b0e008841f
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1756,6 +1756,8 @@
<string name="wifi_wps_failed_auth">Authentication failure. Please try again.</string> <string name="wifi_wps_failed_auth">Authentication failure. Please try again.</string>
<!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] --> <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
<string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string> <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
<!-- Text displayed when WPS fails due to wifi disconnected [CHAR LIMIT=150] -->
<string name="wifi_wps_failed_wifi_disconnected">Wi\u2011Fi disconnected. WPS setup canceled.</string>
<!-- Label for the SSID of the network --> <!-- Label for the SSID of the network -->
<string name="wifi_ssid">Network name</string> <string name="wifi_ssid">Network name</string>
<!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] --> <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->

14
src/com/android/settings/wifi/WpsDialog.java
View File

@@ -125,6 +125,7 @@ public class WpsDialog extends AlertDialog {
mFilter = new IntentFilter(); mFilter = new IntentFilter();
mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
mReceiver = new BroadcastReceiver() { mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -261,7 +262,18 @@ public class WpsDialog extends AlertDialog {
private void handleEvent(Context context, Intent intent) { private void handleEvent(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) { if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
final int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
WifiManager.WIFI_STATE_UNKNOWN);
if (state == WifiManager.WIFI_STATE_DISABLED) {
if (mTimer != null) {
mTimer.cancel();
mTimer = null;
}
String msg = mContext.getString(R.string.wifi_wps_failed_wifi_disconnected);
updateDialog(DialogState.WPS_FAILED, msg);
}
} else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
NetworkInfo info = (NetworkInfo) intent.getParcelableExtra( NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
WifiManager.EXTRA_NETWORK_INFO); WifiManager.EXTRA_NETWORK_INFO);
final NetworkInfo.DetailedState state = info.getDetailedState(); final NetworkInfo.DetailedState state = info.getDetailedState();