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

Commit d531f70d authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android (Google) Code Review
Browse files

Merge "ConversationActions Config installer."

parents a46113a5 f438e14d

api/system-current.txt

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

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

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

    field public static final java.lang.String ACTION_UPDATE_CONVERSATION_ACTIONS = "android.intent.action.UPDATE_CONVERSATION_ACTIONS";

    field public static final java.lang.String ACTION_UPDATE_CT_LOGS = "android.intent.action.UPDATE_CT_LOGS";

    field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL";

    field public static final java.lang.String ACTION_UPDATE_LANG_ID = "android.intent.action.UPDATE_LANG_ID";

core/java/android/os/ConfigUpdate.java

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,14 @@ public final class ConfigUpdate { 
    public static final String ACTION_UPDATE_SMART_SELECTION

            = "android.intent.action.UPDATE_SMART_SELECTION";



    /**

     * Update conversation actions model file.

     * @hide

     */

    @SystemApi

    public static final String ACTION_UPDATE_CONVERSATION_ACTIONS

            = "android.intent.action.UPDATE_CONVERSATION_ACTIONS";



    /**

     * Update network watchlist config file.

     * @hide

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -12137,6 +12137,20 @@ public final class Settings { 
        public static final String SMART_SELECTION_UPDATE_METADATA_URL =

                "smart_selection_metadata_url";













        /**













         * URL for conversation actions model updates













         * @hide













         */













        public static final String CONVERSATION_ACTIONS_UPDATE_CONTENT_URL =













                "conversation_actions_content_url";

























        /**













         * URL for conversation actions model update metadata













         * @hide













         */













        public static final String CONVERSATION_ACTIONS_UPDATE_METADATA_URL =













                "conversation_actions_metadata_url";



























        /**















         * SELinux enforcement status. If 0, permissive; if 1, enforcing.















         * @hide

































core/res/AndroidManifest.xml



+8
−0




























Original line number
Diff line number
Diff line








@@ -4500,6 +4500,14 @@













            </intent-filter>















        </receiver>





























        <receiver android:name="com.android.server.updates.ConversationActionsInstallReceiver"













                  android:permission="android.permission.UPDATE_CONFIG">













            <intent-filter>













                <action android:name="android.intent.action.ACTION_UPDATE_CONVERSATION_ACTIONS" />













                <data android:scheme="content" android:host="*" android:mimeType="*/*" />













            </intent-filter>













        </receiver>





























        <receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"















                  android:permission="android.permission.UPDATE_CONFIG">















            <intent-filter>

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -181,6 +181,8 @@ public class SettingsBackupTest {













                    Settings.Global.CONNECTIVITY_METRICS_BUFFER_SIZE,















                    Settings.Global.CONNECTIVITY_SAMPLING_INTERVAL_IN_SECONDS,















                    Settings.Global.CONTACT_METADATA_SYNC_ENABLED,













                    Settings.Global.CONVERSATION_ACTIONS_UPDATE_CONTENT_URL,













                    Settings.Global.CONVERSATION_ACTIONS_UPDATE_METADATA_URL,















                    Settings.Global.CONTACTS_DATABASE_WAL_ENABLED,















                    Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE,















                    Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,