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

Commit b0e0f22f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9463735 from c956023f to tm-qpr2-release 

Change-Id: I1b1f0cbb1eed5c29db6b3ce12a6774bcdbe0568b
parents e8b6677f c956023f

core/java/android/app/admin/DevicePolicyManager.java

+22 −13
Original line number Diff line number Diff line
@@ -1128,6 +1128,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_TIME_ZONE

        = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -1139,6 +1142,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_LOCAL_TIME

        = "android.app.extra.PROVISIONING_LOCAL_TIME";
@@ -1150,6 +1156,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_LOCALE

        = "android.app.extra.PROVISIONING_LOCALE";
@@ -1159,7 +1168,7 @@ public class DevicePolicyManager { 
     * owner provisioning for downloading the mobile device management application.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SSID

        = "android.app.extra.PROVISIONING_WIFI_SSID";
@@ -1169,7 +1178,7 @@ public class DevicePolicyManager { 
     * is hidden or not.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_HIDDEN

        = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
@@ -1180,7 +1189,7 @@ public class DevicePolicyManager { 
     * {@code WEP} or {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE

        = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
@@ -1190,7 +1199,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD =

            "android.app.extra.PROVISIONING_WIFI_PASSWORD";
@@ -1281,7 +1290,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_HOST

        = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";
@@ -1291,7 +1300,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_PORT

        = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";
@@ -1301,7 +1310,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS

        = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";
@@ -1311,7 +1320,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PAC_URL

        = "android.app.extra.PROVISIONING_WIFI_PAC_URL";
@@ -1321,7 +1330,7 @@ public class DevicePolicyManager { 
     * package. When not provided it is assumed that the device admin package is already installed.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";
@@ -1401,7 +1410,7 @@ public class DevicePolicyManager { 
     * installed package is less than this version code.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";
@@ -1411,7 +1420,7 @@ public class DevicePolicyManager { 
     * url specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";
@@ -1426,7 +1435,7 @@ public class DevicePolicyManager { 
     * be asked to factory reset the device.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     *

     * <p><strong>Note:</strong> for devices running {@link android.os.Build.VERSION_CODES#LOLLIPOP}

     * and {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} only SHA-1 hash is supported.
@@ -1472,7 +1481,7 @@ public class DevicePolicyManager { 
     * the user will be asked to factory reset the device.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM";

core/java/android/view/WindowManagerPolicyConstants.java

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ public interface WindowManagerPolicyConstants { 
            case PowerManager.WAKE_REASON_POWER_BUTTON:

            case PowerManager.WAKE_REASON_PLUGGED_IN:

            case PowerManager.WAKE_REASON_GESTURE:

            case PowerManager.WAKE_REASON_TAP:

            case PowerManager.WAKE_REASON_LIFT:

            case PowerManager.WAKE_REASON_BIOMETRIC:

            case PowerManager.WAKE_REASON_CAMERA_LAUNCH:

            case PowerManager.WAKE_REASON_WAKE_KEY:

            case PowerManager.WAKE_REASON_WAKE_MOTION:

core/java/android/window/ImeOnBackInvokedDispatcher.java

+2 −4
Original line number Diff line number Diff line
@@ -220,16 +220,14 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
     * @param previous the previously focused {@link ViewRootImpl}.

     * @param current the currently focused {@link ViewRootImpl}.

     */

    // TODO(b/232845902): Add CTS to test IME back behavior when there's root view change while

    // IME is up.

    public void switchRootView(ViewRootImpl previous, ViewRootImpl current) {

        for (ImeOnBackInvokedCallback imeCallback : mImeCallbacks) {

            if (previous != null) {

                previous.getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(imeCallback);

            }

            if (current != null) {

                current.getOnBackInvokedDispatcher().registerOnBackInvokedCallback(

                        imeCallback.mPriority, imeCallback);

                current.getOnBackInvokedDispatcher().registerOnBackInvokedCallbackUnchecked(

                        imeCallback, imeCallback.mPriority);

            }

        }

    }

core/res/res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ 
    <string name="permgrouplab_phone" msgid="570318944091926620">"Telefon"</string>

    <string name="permgroupdesc_phone" msgid="270048070781478204">"uskutečňování a spravování telefonních hovorů"</string>

    <string name="permgrouplab_sensors" msgid="9134046949784064495">"Tělesné senzory"</string>

    <string name="permgroupdesc_sensors" msgid="2610631290633747752">"přístup k datům ze snímačů vašich životních funkcí"</string>

    <string name="permgroupdesc_sensors" msgid="2610631290633747752">"přístup k datům ze senzorů vašich životních funkcí"</string>

    <string name="permgrouplab_notifications" msgid="5472972361980668884">"Oznámení"</string>

    <string name="permgroupdesc_notifications" msgid="4608679556801506580">"zobrazovat oznámení"</string>

    <string name="capability_title_canRetrieveWindowContent" msgid="7554282892101587296">"Načítat obsah oken"</string>

core/res/res/values-de/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1681,13 +1681,13 @@ 
    <string name="accessibility_shortcut_multiple_service_warning_title" msgid="3135860819356676426">"Verknüpfung für Bedienungshilfen aktivieren?"</string>

    <string name="accessibility_shortcut_multiple_service_warning" msgid="3740723309483706911">"Wenn du beide Lautstärketasten einige Sekunden lang gedrückt hältst, aktivierst du die Bedienungshilfen. Dadurch kann sich die Funktionsweise deines Geräts ändern.\n\nAktuelle Funktionen:\n<xliff:g id="SERVICE">%1$s</xliff:g>\nDu kannst ausgewählte Funktionen unter \"Einstellungen\" &gt; \"Bedienungshilfen\" ändern."</string>

    <string name="accessibility_shortcut_multiple_service_list" msgid="2128323171922023762">" • <xliff:g id="SERVICE">%1$s</xliff:g>\n"</string>

    <string name="accessibility_shortcut_single_service_warning_title" msgid="1909518473488345266">"Verknüpfung für <xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>

    <string name="accessibility_shortcut_single_service_warning_title" msgid="1909518473488345266">"Kurzbefehl für <xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>

    <string name="accessibility_shortcut_single_service_warning" msgid="6363127705112844257">"Wenn du beide Lautstärketasten einige Sekunden lang gedrückt hältst, aktivierst du die Bedienungshilfe \"<xliff:g id="SERVICE">%1$s</xliff:g>\". Dadurch kann sich die Funktionsweise deines Geräts ändern.\n\nUnter \"Einstellungen &gt; \"Bedienungshilfen\" kannst du dieser Verknüpfung eine andere Funktion zuweisen."</string>

    <string name="accessibility_shortcut_on" msgid="5463618449556111344">"Aktivieren"</string>

    <string name="accessibility_shortcut_off" msgid="3651336255403648739">"Nicht aktivieren"</string>

    <string name="accessibility_shortcut_menu_item_status_on" msgid="6608392117189732543">"AN"</string>

    <string name="accessibility_shortcut_menu_item_status_off" msgid="5531598275559472393">"AUS"</string>

    <string name="accessibility_enable_service_title" msgid="3931558336268541484">"<xliff:g id="SERVICE">%1$s</xliff:g> die vollständige Kontrolle über dein Gerät geben?"</string>

    <string name="accessibility_enable_service_title" msgid="3931558336268541484">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ die vollständige Kontrolle über dein Gerät geben?"</string>

    <string name="accessibility_service_warning_description" msgid="291674995220940133">"Die vollständige Kontrolle sollte nur für Apps aktiviert werden, die dir Zugang zu App-Funktionen erleichtern. Das ist in der Regel nur ein kleiner Teil der Apps."</string>

    <string name="accessibility_service_screen_control_title" msgid="190017412626919776">"Bildschirm aufrufen und steuern"</string>

    <string name="accessibility_service_screen_control_description" msgid="6946315917771791525">"Die Funktion kann alle Inhalte auf dem Bildschirm lesen und diese Inhalte über andere Apps anzeigen."</string>