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

Commit e0a8e5bc authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into... 

Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev am: 06a53d47" into oc-dev-plus-aosp
am: 528adaed

Change-Id: If30d4f866655de89618d1afcb5560f9827691e11
parents 39261109 528adaed

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -33576,7 +33576,9 @@ package android.os { 
    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_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";

    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";

  }

core/java/android/os/ConfigUpdate.java

+15 −0
Original line number Diff line number Diff line
@@ -74,6 +74,21 @@ public final class ConfigUpdate { 
    @SystemApi

    public static final String ACTION_UPDATE_TZDATA = "android.intent.action.UPDATE_TZDATA";



    /**

     * Update language detection model file.

     * @hide

     */

    @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() {

    }

}

core/java/android/provider/Settings.java

+26 −0
Original line number Diff line number Diff line
@@ -9528,6 +9528,32 @@ public final class Settings { 
        public static final String INTENT_FIREWALL_UPDATE_METADATA_URL =

                "intent_firewall_metadata_url";



        /**

         * URL for lang id model updates

         * @hide

         */

        public static final String LANG_ID_UPDATE_CONTENT_URL = "lang_id_content_url";



        /**

         * URL for lang id model update metadata

         * @hide

         */

        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

core/res/AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -3644,6 +3644,22 @@ 
            </intent-filter>

        </receiver>



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

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

            <intent-filter>

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

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

            </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

services/core/java/com/android/server/updates/LangIdInstallReceiver.java

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * 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 LangIdInstallReceiver extends ConfigUpdateInstallReceiver {



    public LangIdInstallReceiver() {

        super(

            "/data/misc/textclassifier/",

            "textclassifier.langid.model",

            "metadata/langid",

            "version");

    }

}