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

Commit f8c4f620 authored by Chris Wren's avatar Chris Wren
Browse files

move network notification IDs to central registry 

Bug: 36808999
Test: make
Change-Id: I34bafa9ce69fc6913a6b4a5935cafd8979d0193b
parent 70c429d3

proto/src/system_messages.proto

+12 −0
Original line number Diff line number Diff line
@@ -157,6 +157,18 @@ message SystemMessage { 
    // Legacy IDs with arbitrary values appear below

    // Legacy IDs existed as stable non-conflicting constants prior to the O release



    // Network status notes, previously decleared in metrics_constants with these values

    // Package: android

    //

    // A captive portal was detected during network validation

    NOTE_NETWORK_SIGN_IN = 740;

    // An unvalidated network without Internet was selected by the user

    NOTE_NETWORK_NO_INTERNET = 741;

    // A validated network failed revalidation and lost Internet access

    NOTE_NETWORK_LOST_INTERNET = 742;

    // The system default network switched to a different network

    NOTE_NETWORK_SWITCH = 743;



    // Notify the user that their work profile has been deleted

    // Package: android

    NOTE_PROFILE_WIPED = 1001;

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

+6 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.util.SparseIntArray; 
import android.widget.Toast;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;



import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
@@ -40,11 +40,12 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI; 


public class NetworkNotificationManager {





    public static enum NotificationType {

        LOST_INTERNET(MetricsEvent.NOTIFICATION_NETWORK_LOST_INTERNET),

        NETWORK_SWITCH(MetricsEvent.NOTIFICATION_NETWORK_SWITCH),

        NO_INTERNET(MetricsEvent.NOTIFICATION_NETWORK_NO_INTERNET),

        SIGN_IN(MetricsEvent.NOTIFICATION_NETWORK_SIGN_IN);

        LOST_INTERNET(SystemMessage.NOTE_NETWORK_LOST_INTERNET),

        NETWORK_SWITCH(SystemMessage.NOTE_NETWORK_SWITCH),

        NO_INTERNET(SystemMessage.NOTE_NETWORK_NO_INTERNET),

        SIGN_IN(SystemMessage.NOTE_NETWORK_SIGN_IN);



        public final int eventId;