Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "move network notification IDs to central registry" into oc-dev

Browse Source
This commit is contained in:
Chris Wren
2017-04-01 16:15:30 +00:00
committed by Android (Google) Code Review
parent 187e0108ff f8c4f620ca
commit fb54aee325
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proto/src/system_messages.proto
View File

@@ -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;

11
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -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;