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

Fix a NPE when forget wifi network

Browse Source 
To prevent the null activity. If activity is null, there is no need to
execute.

Bug: 184154325
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I0dc32e7ea2a0d5a3f2a55ad8936578ed9fadd201
This commit is contained in:
changbetty
2021-05-04 22:17:33 +08:00
parent d8c11f5236
commit e7d468f658
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -958,9 +958,11 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mWifiEntry.forget(this);
}
mMetricsFeatureProvider.action(
mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
mFragment.getActivity().finish();
final Activity activity = mFragment.getActivity();
if (activity != null) {
mMetricsFeatureProvider.action(activity, SettingsEnums.ACTION_WIFI_FORGET);
activity.finish();
}
}
@VisibleForTesting
@@ -1135,8 +1137,11 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
Log.e(TAG, "Forget Wi-Fi network failed");
}
mMetricsFeatureProvider.action(mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
mFragment.getActivity().finish();
final Activity activity = mFragment.getActivity();
if (activity != null) {
mMetricsFeatureProvider.action(activity, SettingsEnums.ACTION_WIFI_FORGET);
activity.finish();
}
}
/**