diff options
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/ConfigUpdate.java | 8 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 14 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/updates/LangIdInstallReceiver.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java | 29 |
6 files changed, 60 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index f5cb5b1d4a00..3f2372ee0dd4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33576,6 +33576,7 @@ package android.os { 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"; field public static final java.lang.String ACTION_UPDATE_PINS = "android.intent.action.UPDATE_PINS"; + field public static final java.lang.String ACTION_UPDATE_SMART_SELECTION = "android.intent.action.UPDATE_SMART_SELECTION"; field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES"; field public static final java.lang.String ACTION_UPDATE_TZDATA = "android.intent.action.UPDATE_TZDATA"; } diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java index f8bab616fafa..139687795430 100644 --- a/core/java/android/os/ConfigUpdate.java +++ b/core/java/android/os/ConfigUpdate.java @@ -81,6 +81,14 @@ public final class ConfigUpdate { @SystemApi public static final String ACTION_UPDATE_LANG_ID = "android.intent.action.UPDATE_LANG_ID"; + /** + * Update smart selection model file. + * @hide + */ + @SystemApi + public static final String ACTION_UPDATE_SMART_SELECTION + = "android.intent.action.UPDATE_SMART_SELECTION"; + private ConfigUpdate() { } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d359b8c6fc8f..c0b2be89e3eb 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9529,6 +9529,20 @@ public final class Settings { public static final String LANG_ID_UPDATE_METADATA_URL = "lang_id_metadata_url"; /** + * URL for smart selection model updates + * @hide + */ + public static final String SMART_SELECTION_UPDATE_CONTENT_URL = + "smart_selection_content_url"; + + /** + * URL for smart selection model update metadata + * @hide + */ + public static final String SMART_SELECTION_UPDATE_METADATA_URL = + "smart_selection_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 7ea9c53d197f..7e3e417fb938 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3632,6 +3632,14 @@ </intent-filter> </receiver> + <receiver android:name="com.android.server.updates.SmartSelectionInstallReceiver" + android:permission="android.permission.UPDATE_CONFIG"> + <intent-filter> + <action android:name="android.intent.action.UPDATE_SMART_SELECTION" /> + <data android:scheme="content" android:host="*" android:mimeType="*/*" /> + </intent-filter> + </receiver> + <receiver android:name="com.android.server.MasterClearReceiver" android:permission="android.permission.MASTER_CLEAR"> <intent-filter diff --git a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java index f7301b09ac63..dfe02ece7160 100644 --- a/services/core/java/com/android/server/updates/LangIdInstallReceiver.java +++ b/services/core/java/com/android/server/updates/LangIdInstallReceiver.java @@ -26,4 +26,3 @@ public class LangIdInstallReceiver extends ConfigUpdateInstallReceiver { "version"); } } - diff --git a/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java b/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java new file mode 100644 index 000000000000..53911c00cff6 --- /dev/null +++ b/services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2017 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 SmartSelectionInstallReceiver extends ConfigUpdateInstallReceiver { + + public SmartSelectionInstallReceiver() { + super( + "/data/misc/textclassifier/", + "textclassifier.smartselection.model", + "metadata/smartselection", + "version"); + } +} + |