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

Commit 4fac9500 authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Don't dismiss quick settings when config Wi-Fi... 

Merge "[Provider Model] Don't dismiss quick settings when config Wi-Fi network" into sc-qpr1-dev am: 24ccad0b am: a024d40d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746808

Change-Id: I7397e42d42a6bd39757690156e39ea756e6a7932
parents f3c37010 a024d40d

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
                final Intent intent = new Intent("com.android.settings.WIFI_DIALOG")

                        .putExtra(EXTRA_CHOSEN_WIFI_ENTRY_KEY, mWifiEntry.getKey());

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                mActivityStarter.startActivity(intent, true);

                mActivityStarter.startActivity(intent, false /* dismissShade */);

            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {

                Toast.makeText(mContext, R.string.wifi_failed_connect_message,

                        Toast.LENGTH_SHORT).show();