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 am: 1678488736

Browse Source 
am: 230d6420b9

Change-Id: I5a05e1bf619b4999d3f329dcc6ce267dba95e598
This commit is contained in:
Salvador Martinez
2018-04-14 19:28:54 -07:00
committed by android-build-merger
parent 3cdd5eedcc 230d6420b9
commit 052baf58a0
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

@@ -90,12 +90,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();
} }