From 7486f1cf121a6416f99fe8034e28d3592f49ea3e Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Fri, 13 Apr 2018 13:01:19 -0700 Subject: [PATCH] Fix mistake in onActivityResult for ConfigureWifiSettings 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 --- src/com/android/settings/wifi/ConfigureWifiSettings.java | 6 +++--- .../android/settings/wifi/WifiScanningRequiredFragment.java | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 96b2d03c3dc..818b295e0b8 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -88,12 +88,12 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override 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); return; } - if (resultCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY - && mUseOpenWifiPreferenceController == null) { + if (requestCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY + && mUseOpenWifiPreferenceController != null) { mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode); return; } diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index bf24bbcd9c1..d7b6708954a 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -54,7 +54,6 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp .setNegativeButton(R.string.cancel, null); addButtonIfNeeded(builder); - return builder.create(); }