commit cee2094d756caedfc271587dae7e4f5a6582f72d
author Ricky Wai <rickywai@google.com> Tue Jan 23 14:27:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 14:27:29 2018 +0000
tree 09474b3c2567130454fbea2cc6054d202f4acda2
parent c61216d4a2da4dcc0225f99773339c4a80aa9f13
parent 3b123af9f2bff69415cb4c0d880df8d8e3413794

Merge "Add update network watchlist config ConfigUpdater intent action"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6119d5f..306a573 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3447,6 +3447,7 @@
     field public static final java.lang.String ACTION_UPDATE_CT_LOGS = "android.intent.action.UPDATE_CT_LOGS";
     field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL";
     field public static final java.lang.String ACTION_UPDATE_LANG_ID = "android.intent.action.UPDATE_LANG_ID";
+    field public static final java.lang.String ACTION_UPDATE_NETWORK_WATCHLIST = "android.intent.action.UPDATE_NETWORK_WATCHLIST";
     field public static final java.lang.String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS";
     field public static final java.lang.String ACTION_UPDATE_SMART_SELECTION = "android.intent.action.UPDATE_SMART_SELECTION";
     field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";

core/java/android/os/ConfigUpdate.java

diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java
index 94a44ec..dda0ed8 100644
--- a/core/java/android/os/ConfigUpdate.java
+++ b/core/java/android/os/ConfigUpdate.java
@@ -82,6 +82,14 @@
     public static final String ACTION_UPDATE_SMART_SELECTION
             = "android.intent.action.UPDATE_SMART_SELECTION";
 
+    /**
+     * Update network watchlist config file.
+     * @hide
+     */
+    @SystemApi
+    public static final String ACTION_UPDATE_NETWORK_WATCHLIST
+            = "android.intent.action.UPDATE_NETWORK_WATCHLIST";
+
     private ConfigUpdate() {
     }
 }