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

Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev

Browse Source 
am: 1678488736

Change-Id: I0ea6f839eb33ba147ebae657999164b872d57fb6
This commit is contained in:
Salvador Martinez
2018-04-14 19:02:25 -07:00
committed by android-build-merger
parent fbc5abb8e1 1678488736
commit 230d6420b9
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
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;
}

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);
addButtonIfNeeded(builder);
return builder.create();
}