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

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

Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue"... 

Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a523

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

Change-Id: Idf7b4b486dbc2066a9a7d7e85af5969fdf9de204
parents 17624b21 b121a523

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

+3 −0
Original line number Diff line number Diff line
@@ -233,6 +233,9 @@ public class WifiSettings extends RestrictedSettingsFragment 


        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {

            final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS");

            // Add FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TASK to avoid multiple

            // instances issue. (e.g. b/191956700)

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

            final Bundle extras = getActivity().getIntent().getExtras();

            if (extras != null) {

                intent.putExtras(extras);