summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2021-03-19 08:27:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-19 08:27:56 +0000
commitdd535a61fcbc0254899e442dd63b9daafe9da143 (patch)
tree22c62540212687abf6542211d8a499f250372ad5
parent6ddd31dc3aa0958602bf612c8aa967a5dbf0778d (diff)
parent8ce1fa23138829a6fd73d98475cce36cdca8530f (diff)
Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766 Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index ecebfb2733b2..66980edf328f 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -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".