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

Commit 94b8a44d authored by Youngtae Cha's avatar Youngtae Cha Committed by Android (Google) Code Review
Browse files

Merge "Support config update" into main

parents 61b0f8fa 4fb6c6f5

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -10392,6 +10392,7 @@ package android.os { 
  public final class ConfigUpdate {

    field public static final String ACTION_UPDATE_CARRIER_ID_DB = "android.os.action.UPDATE_CARRIER_ID_DB";

    field public static final String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";

    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String ACTION_UPDATE_CONFIG = "android.os.action.UPDATE_CONFIG";

    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 public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB = "android.os.action.UPDATE_EMERGENCY_NUMBER_DB";
@@ -10401,6 +10402,7 @@ package android.os { 
    field public static final String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS";

    field public static final String ACTION_UPDATE_SMART_SELECTION = "android.intent.action.UPDATE_SMART_SELECTION";

    field public static final String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";

    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String EXTRA_DOMAIN = "android.os.extra.DOMAIN";

    field public static final String EXTRA_REQUIRED_HASH = "android.os.extra.REQUIRED_HASH";

    field public static final String EXTRA_VERSION = "android.os.extra.VERSION";

  }

core/java/android/os/ConfigUpdate.java

+28 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.annotation.FlaggedApi;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;
@@ -130,6 +131,23 @@ public final class ConfigUpdate { 
    public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB =

            "android.os.action.UPDATE_EMERGENCY_NUMBER_DB";



    /**

     * Broadcast intent action indicating that the updated config data is available.

     * This broadcast intent action is to be sent by the config updater app, and will be received

     * and handled by the platform.

     * <p>Extra: {@link #EXTRA_VERSION} the numeric version of the database.

     * <p>Extra: {@link #EXTRA_REQUIRED_HASH} hash of the database, which is encoded by base-16

     * SHA512

     * <p>Extra: {@link #EXTRA_DOMAIN} the string identifying the affected module

     * <p>Input: {@link android.content.Intent#getData} the URI to download config data file

     *

     * @hide

     */

    @SystemApi

    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_UPDATE_CONFIG = "android.os.action.UPDATE_CONFIG";



    /**

     * An integer to indicate the numeric version of the new data. Devices should only install

     * if the update version is newer than the current one.
@@ -147,6 +165,16 @@ public final class ConfigUpdate { 
    @SystemApi

    public static final String EXTRA_REQUIRED_HASH = "android.os.extra.REQUIRED_HASH";



    /**

     * String identifying the affected module.

     * Devices apply the updated config data to the module specified in the string.

     *

     * @hide

     */

    @SystemApi

    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final String EXTRA_DOMAIN  = "android.os.extra.DOMAIN";



    private ConfigUpdate() {

    }

}

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ applications that come with the platform 
        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>

        <permission name="android.permission.UWB_PRIVILEGED"/>

        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>

        <permission name="android.permission.UPDATE_CONFIG"/>

        <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" />

    </privapp-permissions>