Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 am: 3ff1e2fe49

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

Change-Id: I1428a4bf9be18601ff70e8fc50e06fecac158a4b
This commit is contained in:
Chiachang Wang
2021-03-19 09:02:20 +00:00
committed by Automerger Merge Worker

View File

@@ -4307,7 +4307,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
Intent intent = new Intent(action);
if (type != NotificationType.PRIVATE_DNS_BROKEN) {
intent.setData(Uri.fromParts("netId", Integer.toString(nai.network.getNetId()), null));
intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nai.network);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// Some OEMs have their own Settings package. Thus, need to get the current using
// Settings package name instead of just use default name "com.android.settings".