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

Commit c96f60e0 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "Make WifiDppEnrolleeActivity launches explicit"

parents 8e3ff612 59c0a7bc

src/com/android/settings/network/NetworkProviderSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
    @Override

    public void onScan(WifiDialog2 dialog, String ssid) {

        // Launch QR code scanner to join a network.

        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),

        startActivityForResult(

                WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid),

                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf 
            final String ssid = ssidEditText.getText().toString();



            // Launch QR code scanner to join a network.

            startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),

            startActivityForResult(

                    WifiDppUtils.getEnrolleeQrCodeScannerIntent(view.getContext(), ssid),

                    REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class AddWifiNetworkPreference extends Preference { 
                getContext().getString(R.string.wifi_dpp_scan_qr_code));

        scanButton.setOnClickListener(view -> {

            getContext().startActivity(

                WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null));

                    WifiDppUtils.getEnrolleeQrCodeScannerIntent(getContext(), /* ssid */ null));

        });

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog 


    @Override

    public void onScan(WifiDialog2 dialog, String ssid) {

        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);

        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid);

        WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);



        // Launch QR code scanner to join a network.
@@ -329,7 +329,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog 


    @Override

    public void onScan(WifiDialog dialog, String ssid) {

        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);

        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid);

        WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);



        // Launch QR code scanner to join a network.

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

+2 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
    @Override

    public void onScan(WifiDialog2 dialog, String ssid) {

        // Launch QR code scanner to join a network.

        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),

        startActivityForResult(

                WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid),

                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);

    }