Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313 am: dd535a61fc am: 6c7233c57e

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

Change-Id: I54259f3084560fe457e3108dee815d0e305675c2
This commit is contained in:
Chiachang Wang
2021-03-19 09:43:49 +00:00
committed by Automerger Merge Worker

View File

@@ -4320,7 +4320,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".