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

Merge "Fix leaked windows exception in WifiDialogActivity"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-30 16:16:20 +00:00
committed by Android (Google) Code Review
parent 5ade2f1976 656e94cc06
commit fbfca0428b
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -52,6 +52,8 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
@VisibleForTesting
static final String KEY_CONNECT_FOR_CALLER = "connect_for_caller";
private WifiDialog mDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
final Intent intent = getIntent();
@@ -67,10 +69,10 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
accessPoint = new AccessPoint(this, accessPointState);
}
WifiDialog dialog = WifiDialog.createModal(
mDialog = WifiDialog.createModal(
this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
dialog.show();
dialog.setOnDismissListener(this);
mDialog.show();
mDialog.setOnDismissListener(this);
}
@Override
@@ -79,6 +81,15 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
overridePendingTransition(0, 0);
}
@Override
public void onDestroy() {
super.onDestroy();
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
mDialog = null;
}
}
@Override
public void onForget(WifiDialog dialog) {
final WifiManager wifiManager = getSystemService(WifiManager.class);
@@ -147,6 +158,7 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
@Override
public void onDismiss(DialogInterface dialogInterface) {
mDialog = null;
finish();
}
}