| commit | 3ff1e2fe4939e5aedd34d3a5414fe40530c5eca2 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Fri Mar 19 08:27:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 08:27:56 2021 +0000 |
| tree | d0bf9f1c737df8ac96a6de3f6b05a1ebb49debd3 | |
| parent | 2f04604df265bbf16630d6b8acd1bc77bb1ff5ff [diff] | |
| parent | 94dc99ea3875c88037e7e8b58e1b2b0c196a0806 [diff] |
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766 Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ecebfb2..66980ed 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4307,7 +4307,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".