Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afb5aa53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed doc" into rvc-dev

parents d961f717 ad00ab29

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/os/ConfigUpdate.java

+3 −4
Original line number Diff line number Diff line
@@ -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

     */