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

Commit 882067d8 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Saving `WifiConfiguration` into a local variable to avoid null pointer." into main

parents a72d49ad 8f4dde53
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -1506,15 +1506,17 @@ public class InternetDetailsContentController implements AccessPointController.A

    Intent getConfiguratorQrCodeGeneratorIntentOrNull(WifiEntry wifiEntry) {
        if (!mFeatureFlags.isEnabled(Flags.SHARE_WIFI_QS_BUTTON) || wifiEntry == null
                || mWifiManager == null || !wifiEntry.canShare()
                || wifiEntry.getWifiConfiguration() == null) {
                || mWifiManager == null || !wifiEntry.canShare()) {
            return null;
        }
        var wifiConfiguration = wifiEntry.getWifiConfiguration();
        if (wifiConfiguration == null) {
            return null;
        }
        Intent intent = new Intent();
        intent.setAction(WifiDppIntentHelper.ACTION_CONFIGURATOR_AUTH_QR_CODE_GENERATOR);
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
        WifiDppIntentHelper.setConfiguratorIntentExtra(intent, mWifiManager,
                wifiEntry.getWifiConfiguration());
        WifiDppIntentHelper.setConfiguratorIntentExtra(intent, mWifiManager, wifiConfiguration);
        return intent;
    }
}