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

Commit de8493a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16509324

Change-Id: I85beb9352125aaa74df850853b81a1f9f82b24d0
parents 0bac54a0 b94ae9ff

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

+2 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,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
@@ -309,7 +309,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.
@@ -318,7 +318,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
@@ -1035,7 +1035,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);

    }