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

Commit e69dc5cc authored by Johnson Lu's avatar Johnson Lu
Browse files

Check whether the device support DPP for public intent 

Check PROCESS_WIFI_EASY_CONNECT_QR_CODE intent.

Bug: 122331217
Test: manual test
Change-Id: I9bc4007f8c01d11a186640e8ef59be6329350dc9
parent 3eac2faa

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -142,7 +142,11 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
            case ACTION_PROCESS_WIFI_DPP_QR_CODE:

                String qrCode = intent.getStringExtra(WifiDppUtils.EXTRA_QR_CODE);

                mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);

                if (mWifiDppQrCode == null) {

                final boolean isDppSupported = WifiDppUtils.isWifiDppEnabled(this);

                if (!isDppSupported) {

                    Log.d(TAG, "Device doesn't support Wifi DPP");

                }

                if (mWifiDppQrCode == null || !isDppSupported) {

                    cancelActivity = true;

                } else {

                    showChooseSavedWifiNetworkFragment(/* addToBackStack */ false);

src/com/android/settings/wifi/dpp/WifiDppUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ public class WifiDppUtils { 
                com.android.settings.core.FeatureFlags.WIFI_SHARING);

    }



    /**

     * Returns whether the device support WiFi DPP.

     */

    public static boolean isWifiDppEnabled(Context context) {

        final WifiManager manager = context.getSystemService(WifiManager.class);

        return manager.isEasyConnectSupported();

    }



    /**

     * Returns an intent to launch QR code scanner for Wi-Fi DPP enrollee.

     *