summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2020-12-14 22:58:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-14 22:58:46 +0000
commit6083210d173dd9b0402e207e3f27ea24cc2bc31c (patch)
tree978ec4d9b34f70ff48a223bc86f390e463ef0640 /core/java
parent6e35bf94ecc64309dda81d6d52f361312ffb5743 (diff)
parent00872652ccca67216b17a70c17024ff709952155 (diff)
Merge changes Icf10d577,Ia9d3cae7
* changes: Factor out a class to store the rebootEscrow key Add namespace in DeviceConfig to support ota teams's features
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/DeviceConfig.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 4d67d4623897..e7e2c619ee6a 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -403,6 +403,14 @@ public final class DeviceConfig {
public static final String NAMESPACE_PERMISSIONS = "permissions";
/**
+ * Namespace for ota related features.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_OTA = "ota";
+
+ /**
* Namespace for all widget related features.
*
* @hide