| commit | e79617978f469c1bd68b30a3532c0af6bba053ae | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Mar 19 09:43:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 09:43:49 2021 +0000 |
| tree | 3ca22af5953fac2c31d8aeced70c4d0e42cae66f | |
| parent | 511a67f767586581c5c6d053e594d4993c607da0 [diff] | |
| parent | 7bbc040746e5898eae87ddf7e79dd1094f9f264f [diff] |
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 am: 3ff1e2fe49 am: 7bbc040746 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766 Change-Id: I54259f3084560fe457e3108dee815d0e305675c2
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 37513a3..9793317 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4320,7 +4320,7 @@ 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".