diff options
| author | Ricky Wai <rickywai@google.com> | 2018-01-23 14:27:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-23 14:27:29 +0000 |
| commit | cee2094d756caedfc271587dae7e4f5a6582f72d (patch) | |
| tree | 09474b3c2567130454fbea2cc6054d202f4acda2 | |
| parent | c61216d4a2da4dcc0225f99773339c4a80aa9f13 (diff) | |
| parent | 3b123af9f2bff69415cb4c0d880df8d8e3413794 (diff) | |
Merge "Add update network watchlist config ConfigUpdater intent action"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/ConfigUpdate.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6119d5f0c548..306a57305d6b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3447,6 +3447,7 @@ package android.os { 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"; diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java index 94a44ec3729a..dda0ed8a5e20 100644 --- a/core/java/android/os/ConfigUpdate.java +++ b/core/java/android/os/ConfigUpdate.java @@ -82,6 +82,14 @@ public final class ConfigUpdate { 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() { } } |