Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed doc" into rvc-dev am: afb5aa530b

Browse Source 
Change-Id: Ifdb328a12d0420210adecca083272add76107f5a
This commit is contained in:
TreeHugger Robot
2020-03-21 00:40:25 +00:00
committed by Automerger Merge Worker
parent 6b9429e171 afb5aa530b
commit 46ff7571bd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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";

7
core/java/android/os/ConfigUpdate.java
View File

@@ -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.
* <p>Extra: {@link #EXTRA_VERSION} the numeric version of the database.
* <p>Extra: {@link #EXTRA_REQUIRED_HASH} the hash of the database.
* <p>Extra: {@link #EXTRA_REQUIRED_HASH} hash of the database, which is encoded by base-16
* SHA512.
* <p>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
*/