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

Fix mistake in onActivityResult for ConfigureWifiSettings

Browse Source 
Accidently checked the result code instead of request code when
trying to route the callback to the correct controller. This
CL fixes that.

Test: robotests still pass
Bug: 77543817
Change-Id: Ice1dd799d3f06f86743940c5202d308c21e88cdf
This commit is contained in:
Salvador Martinez
2018-04-13 13:01:19 -07:00
parent d57d27acab
commit 7486f1cf12
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,12 +88,12 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == WIFI_WAKEUP_REQUEST_CODE && mWifiWakeupPreferenceController != null) { if (requestCode == WIFI_WAKEUP_REQUEST_CODE && mWifiWakeupPreferenceController != null) {
mWifiWakeupPreferenceController.onActivityResult(requestCode, resultCode); mWifiWakeupPreferenceController.onActivityResult(requestCode, resultCode);
return; return;
} }
if (resultCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY if (requestCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY
&& mUseOpenWifiPreferenceController == null) { && mUseOpenWifiPreferenceController != null) {
mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode); mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode);
return; return;
} }

1
src/com/android/settings/wifi/WifiScanningRequiredFragment.java
View File

@@ -54,7 +54,6 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp
.setNegativeButton(R.string.cancel, null); .setNegativeButton(R.string.cancel, null);
addButtonIfNeeded(builder); addButtonIfNeeded(builder);
return builder.create(); return builder.create();
} }