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

Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I2f3e5559c012457715257e5734121ae936f99782
This commit is contained in:
TreeHugger Robot
2022-03-23 08:11:00 +00:00
committed by Automerger Merge Worker
parent e7dc92220a 764d7f4b73
commit 5c1e297131
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,12 +58,17 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
final static String EXTRA_IS_SPECIFIED_SSID =
"com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
@VisibleForTesting NetworkRequestDialogBaseFragment mDialogFragment;
@VisibleForTesting
NetworkRequestDialogBaseFragment mDialogFragment;
@VisibleForTesting
boolean mIsSpecifiedSsid;
@VisibleForTesting
boolean mShowingErrorDialog;
@VisibleForTesting
ProgressDialog mProgressDialog;
private NetworkRequestUserSelectionCallback mUserSelectionCallback;
private boolean mIsSpecifiedSsid;
private boolean mShowingErrorDialog;
private WifiConfiguration mMatchedConfig;
@VisibleForTesting ProgressDialog mProgressDialog;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -103,7 +108,8 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
mDialogFragment.show(getSupportFragmentManager(), TAG);
}
private void dismissDialogs() {
@VisibleForTesting
void dismissDialogs() {
if (mDialogFragment != null) {
mDialogFragment.dismiss();
mDialogFragment = null;
@@ -174,7 +180,9 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
return;
}
mDialogFragment.onUserSelectionCallbackRegistration(userSelectionCallback);
if (mDialogFragment != null) {
mDialogFragment.onUserSelectionCallbackRegistration(userSelectionCallback);
}
}
@Override
@@ -201,7 +209,9 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
return;
}
mDialogFragment.onMatch(scanResults);
if (mDialogFragment != null) {
mDialogFragment.onMatch(scanResults);
}
}
@Override