diff options
7 files changed, 63 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index bf2c35715d73..0d8ed4487216 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java index 7858c5986bcb..767c15caefd0 100644 --- a/core/java/android/os/ConfigUpdate.java +++ b/core/java/android/os/ConfigUpdate.java @@ -83,6 +83,14 @@ public final class ConfigUpdate { = "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 */ diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 943888b069a5..d579f0ff3681 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12138,6 +12138,20 @@ public final class Settings { "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 */ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e35b701aadcc..e064423a9bb9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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> diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 002b6a84f592..4802ebea2511 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -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, diff --git a/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java b/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java new file mode 100644 index 000000000000..7310af3a6eb6 --- /dev/null +++ b/services/core/java/com/android/server/updates/ConversationActionsInstallReceiver.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.updates; + +public class ConversationActionsInstallReceiver extends ConfigUpdateInstallReceiver { + + public ConversationActionsInstallReceiver() { + super( + "/data/misc/textclassifier/", + "actions_suggestions.model", + "metadata/actions_suggestions", + "version"); + } +} diff --git a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java index dfe02ece7160..05dad2178798 100644 --- a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java +++ b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java @@ -21,8 +21,8 @@ public class LangIdInstallReceiver extends ConfigUpdateInstallReceiver { public LangIdInstallReceiver() { super( "/data/misc/textclassifier/", - "textclassifier.langid.model", - "metadata/langid", + "lang_id.model", + "metadata/lang_id", "version"); } } |