Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96fcaa56 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Send a Network instead of network id for wifi no internet dialog" am:... 

Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa23 am: dd535a61 am: 6c7233c5

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

Change-Id: I54259f3084560fe457e3108dee815d0e305675c2
parents 68e43b85 6c7233c5

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -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".