summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chad Brubaker <cbrubaker@google.com> 2017-03-10 13:31:38 -0800
committer Chad Brubaker <cbrubaker@google.com> 2017-04-06 17:18:13 +0000
commit19f98d9707c7cb73d9a963bb35a70942c68e1081 (patch)
tree33bd3860775bda3127e572b8bc24ee2b5b102598
parent0b47e289c86a271d1cddd8267178f788bfb2ef06 (diff)
Expose ConfigUpdater Intents in SystemApi
The Intents are are in the android namespace and should have been exposed as SystemApi, but were not previously. Since there are no classes in the framework that reference these Intents this adds android.os.ConfigUpdate to have them all in one place. Test: builds Change-Id: I2086945301f06b28b491ec876652c37e97315e8c Fixes: 35252508 Fixes: 35266806 Fixes: 35266833 Fixes: 35271111 (cherry picked from commit 987b0fc4a57c8b8246b12069a5db06693bc3eea6)
-rw-r--r--api/system-current.txt8
-rw-r--r--core/java/android/os/ConfigUpdate.java72
2 files changed, 80 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 16e6f5b1e34d..5fff1166f052 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33587,6 +33587,14 @@ package android.os {
method public void open();
}
+ public final class ConfigUpdate {
+ field public static final java.lang.String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";
+ 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_PINS = "android.intent.action.UPDATE_PINS";
+ field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";
+ }
+
public abstract class CountDownTimer {
ctor public CountDownTimer(long, long);
method public final synchronized void cancel();
diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java
new file mode 100644
index 000000000000..304ee292182d
--- /dev/null
+++ b/core/java/android/os/ConfigUpdate.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import android.annotation.SystemApi;
+
+/**
+ * Intents used to provide unbundled updates of system data.
+ * All require the UPDATE_CONFIG permission.
+ *
+ * @see com.android.server.updates
+ * @hide
+ */
+@SystemApi
+public final class ConfigUpdate {
+
+ /**
+ * Update system wide certificate pins for TLS connections.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS";
+
+ /**
+ * Update system wide Intent firewall.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_UPDATE_INTENT_FIREWALL
+ = "android.intent.action.UPDATE_INTENT_FIREWALL";
+
+ /**
+ * Update list of permium SMS short codes.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_UPDATE_SMS_SHORT_CODES
+ = "android.intent.action.UPDATE_SMS_SHORT_CODES";
+
+ /**
+ * Update list of carrier provisioning URLs.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_UPDATE_CARRIER_PROVISIONING_URLS
+ = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";
+
+ /**
+ * Update set of trusted logs used for Certificate Transparency support for TLS connections.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_UPDATE_CT_LOGS
+ = "android.intent.action.UPDATE_CT_LOGS";
+
+ private ConfigUpdate() {
+ }
+}