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

Commit 428d357e authored by Paul Jensen's avatar Paul Jensen Committed by android-build-merger
Browse files

Merge \\"Show sign-in to network notification to all users, not just owner.\\"... 

Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: 78452db2
am: 1339a632

Change-Id: I82726a61541da890dea12448b2823f3dd7e367d2
parents 77d5fa74 1339a632

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

+2 −2
Original line number Diff line number Diff line
@@ -3566,14 +3566,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    .build();



            try {

                notificationManager.notify(NOTIFICATION_ID, id, notification);

                notificationManager.notifyAsUser(NOTIFICATION_ID, id, notification, UserHandle.ALL);

            } catch (NullPointerException npe) {

                loge("setNotificationVisible: visible notificationManager npe=" + npe);

                npe.printStackTrace();

            }

        } else {

            try {

                notificationManager.cancel(NOTIFICATION_ID, id);

                notificationManager.cancelAsUser(NOTIFICATION_ID, id, UserHandle.ALL);

            } catch (NullPointerException npe) {

                loge("setNotificationVisible: cancel notificationManager npe=" + npe);

                npe.printStackTrace();