diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-12-14 22:58:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-14 22:58:46 +0000 |
| commit | 6083210d173dd9b0402e207e3f27ea24cc2bc31c (patch) | |
| tree | 978ec4d9b34f70ff48a223bc86f390e463ef0640 /core | |
| parent | 6e35bf94ecc64309dda81d6d52f361312ffb5743 (diff) | |
| parent | 00872652ccca67216b17a70c17024ff709952155 (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')
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 244df9b59cc8..de8e18046a39 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7886,6 +7886,7 @@ package android.provider { field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; + field public static final String NAMESPACE_OTA = "ota"; field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; 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 |