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

Commit 3a37cb65 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix the comments left on aosp/1481197" am: 464bc344 

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

Change-Id: I7f13f380db5fe30e67be9cedc9429519b9fd4b6e
parents 43dbf5cb 464bc344

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

+6 −5
Original line number Diff line number Diff line
@@ -75,10 +75,11 @@ public class NetworkNotificationManager { 
    private static final boolean DBG = true;



    // Notification channels used by ConnectivityService mainline module, it should be aligned with

    // SystemNotificationChannels.

    public static final String NOTIFICATION_NETWORK_STATUS = "NETWORK_STATUS";

    public static final String NOTIFICATION_NETWORK_ALERTS = "NETWORK_ALERTS";

    public static final String NOTIFICATION_VPN = "VPN";

    // SystemNotificationChannels so the channels are the same as the ones used as the system

    // server.

    public static final String NOTIFICATION_CHANNEL_NETWORK_STATUS = "NETWORK_STATUS";

    public static final String NOTIFICATION_CHANNEL_NETWORK_ALERTS = "NETWORK_ALERTS";

    public static final String NOTIFICATION_CHANNEL_VPN = "VPN";



    // The context is for the current user (system server)

    private final Context mContext;
@@ -263,7 +264,7 @@ public class NetworkNotificationManager { 
        // the tag.

        final boolean hasPreviousNotification = previousNotifyType != null;

        final String channelId = (highPriority && !hasPreviousNotification)

                ? NOTIFICATION_NETWORK_ALERTS : NOTIFICATION_NETWORK_STATUS;

                ? NOTIFICATION_CHANNEL_NETWORK_ALERTS : NOTIFICATION_CHANNEL_NETWORK_STATUS;

        Notification.Builder builder = new Notification.Builder(mContext, channelId)

                .setWhen(System.currentTimeMillis())

                .setShowWhen(notifyType == NotificationType.NETWORK_SWITCH)

services/core/java/com/android/server/connectivity/Vpn.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import static android.net.RouteInfo.RTN_UNREACHABLE; 


import static com.android.internal.util.Preconditions.checkArgument;

import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_VPN;

import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_CHANNEL_VPN;



import android.Manifest;

import android.annotation.NonNull;
@@ -1945,7 +1945,7 @@ public class Vpn { 
            final PendingIntent configIntent = mSystemServices.pendingIntentGetActivityAsUser(

                    intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, user);

            final Notification.Builder builder =

                    new Notification.Builder(mContext, NOTIFICATION_VPN)

                    new Notification.Builder(mContext, NOTIFICATION_CHANNEL_VPN)

                            .setSmallIcon(R.drawable.vpn_connected)

                            .setContentTitle(mContext.getString(R.string.vpn_lockdown_disconnected))

                            .setContentText(mContext.getString(R.string.vpn_lockdown_config))

services/core/java/com/android/server/net/LockdownVpnTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server.net; 


import static android.provider.Settings.ACTION_VPN_SETTINGS;



import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_VPN;

import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_CHANNEL_VPN;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -257,7 +257,7 @@ public class LockdownVpnTracker { 


    private void showNotification(int titleRes, int iconRes) {

        final Notification.Builder builder =

                new Notification.Builder(mContext, NOTIFICATION_VPN)

                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_VPN)

                        .setWhen(0)

                        .setSmallIcon(iconRes)

                        .setContentTitle(mContext.getString(titleRes))