Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16784887 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ce53cbee 7486f1cf

src/com/android/settings/wifi/ConfigureWifiSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }

src/com/android/settings/wifi/WifiScanningRequiredFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp 
                .setNegativeButton(R.string.cancel, null);

        addButtonIfNeeded(builder);





        return builder.create();

    }