commit b121a5235900fd8232e1cdf5eecef89df7e63da2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 29 13:10:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 29 13:10:54 2021 +0000
tree e0774bbe15be34482b56b0987adc4e058b99935b
parent c8abbc4d8d4c78920e0f194f2ea18c1574baf983
parent 5796ebf67f6c419627c96134e8d05fcea83ac3b0

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

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 75e6307..59f6504 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -233,6 +233,9 @@
 
         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);