diff --git a/api/system-current.txt b/api/system-current.txt index c8b74d8c2a982..5035eb5208aab 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8184,7 +8184,7 @@ package android.os { field public static final String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS"; field public static final String ACTION_UPDATE_CONVERSATION_ACTIONS = "android.intent.action.UPDATE_CONVERSATION_ACTIONS"; field public static final String ACTION_UPDATE_CT_LOGS = "android.intent.action.UPDATE_CT_LOGS"; - field @RequiresPermission("android.permission.UPDATE_CONFIG") public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB = "android.os.action.UPDATE_EMERGENCY_NUMBER_DB"; + field public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB = "android.os.action.UPDATE_EMERGENCY_NUMBER_DB"; field public static final String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL"; field public static final String ACTION_UPDATE_LANG_ID = "android.intent.action.UPDATE_LANG_ID"; field public static final String ACTION_UPDATE_NETWORK_WATCHLIST = "android.intent.action.UPDATE_NETWORK_WATCHLIST"; diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java index a28f5fbaba0b6..4908919e59c0b 100644 --- a/core/java/android/os/ConfigUpdate.java +++ b/core/java/android/os/ConfigUpdate.java @@ -16,7 +16,6 @@ package android.os; -import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; @@ -119,14 +118,14 @@ public final class ConfigUpdate { /** * Update the emergency number database into the devices. *

Extra: {@link #EXTRA_VERSION} the numeric version of the database. - *

Extra: {@link #EXTRA_REQUIRED_HASH} the hash of the database. + *

Extra: {@link #EXTRA_REQUIRED_HASH} hash of the database, which is encoded by base-16 + * SHA512. *

Input: {@link android.content.Intent#getData} the URI to download emergency number * database. * * @hide */ @SystemApi - @RequiresPermission(android.Manifest.permission.UPDATE_CONFIG) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB = "android.os.action.UPDATE_EMERGENCY_NUMBER_DB"; @@ -141,7 +140,7 @@ public final class ConfigUpdate { public static final String EXTRA_VERSION = "android.os.extra.VERSION"; /** - * A string to indicate the hash of the data. + * Hash of the database, which is encoded by base-16 SHA512. * * @hide */