From 3b123af9f2bff69415cb4c0d880df8d8e3413794 Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Mon, 22 Jan 2018 12:12:42 +0000 Subject: [PATCH] Add update network watchlist config ConfigUpdater intent action Network watchlist config update intent needs to be in SystemAPI as it will be used by ConfigUpdater to push watchlist config. We also need to mark it as SystemAPI to pass cts: intent.IntentTest#shouldNotFindUnexpectedIntents Bug: 71635926 Bug: 63908748 Test: Able to compile Change-Id: I3a236fa8b0bf97249b01a2ad20c5e56d18121bd4 --- api/system-current.txt | 1 + core/java/android/os/ConfigUpdate.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index f35984aaf8d1d..72db3b8a44e52 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3430,6 +3430,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 94a44ec3729a7..dda0ed8a5e201 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() { } }