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

Commit 143c3cd1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7215955 from 3a9dd32f to rvc-qpr3-release 

Change-Id: I964b0417c5f2b6582138d8cab3f357e27af881f7
parents 8eca75b4 3a9dd32f

core/java/android/app/backup/BackupManager.java

+20 −2
Original line number Diff line number Diff line
@@ -21,10 +21,14 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;
@@ -391,6 +395,17 @@ public class BackupManager { 
        return false;

    }





    /**

     * If this change is enabled, the {@code BACKUP} permission needed for

     * {@code isBackupServiceActive()} will be enforced on the service end

     * rather than client-side in {@link BackupManager}.

     * @hide

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)

    public static final long IS_BACKUP_SERVICE_ACTIVE_ENFORCE_PERMISSION_IN_SERVICE = 158482162;



    /**

     * Report whether the backup mechanism is currently active.

     * When it is inactive, the device will not perform any backup operations, nor will it
@@ -401,8 +416,11 @@ public class BackupManager { 
    @SystemApi

    @RequiresPermission(android.Manifest.permission.BACKUP)

    public boolean isBackupServiceActive(UserHandle user) {

        if (!CompatChanges.isChangeEnabled(

                IS_BACKUP_SERVICE_ACTIVE_ENFORCE_PERMISSION_IN_SERVICE)) {

            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,

                    "isBackupServiceActive");

        }

        checkServiceBinder();

        if (sService != null) {

            try {

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

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
    <string name="network_logging_notification_title" msgid="554983187553845004">"Jabeak kudeatzen du gailua"</string>

    <string name="network_logging_notification_text" msgid="1327373071132562512">"Erakundeak kudeatzen du gailua eta baliteke sareko trafikoa gainbegiratzea. Sakatu hau xehetasunak ikusteko."</string>

    <string name="location_changed_notification_title" msgid="3620158742816699316">"Aplikazioek zure kokapena atzi dezakete"</string>

    <string name="location_changed_notification_text" msgid="7158423339982706912">"Informazio gehiago lortzeko, jo IKT sailaren administratzailearengana"</string>

    <string name="location_changed_notification_text" msgid="7158423339982706912">"Informazio gehiago lortzeko, jo IKT saileko administratzailearengana"</string>

    <string name="country_detector" msgid="7023275114706088854">"Herrialde-hautemailea"</string>

    <string name="location_service" msgid="2439187616018455546">"Kokapen-zerbitzua"</string>

    <string name="sensor_notification_service" msgid="7474531979178682676">"Sentsorearen jakinarazpen-zerbitzua"</string>
@@ -1183,7 +1183,7 @@ 
    <string name="unsupported_display_size_show" msgid="980129850974919375">"Erakutsi beti"</string>

    <string name="unsupported_compile_sdk_message" msgid="7326293500707890537">"Android sistema eragilearen bertsio bateraezin baterako dago egina <xliff:g id="APP_NAME">%1$s</xliff:g>; beraz, espero ez bezala funtziona lezake. Baliteke aplikazioaren bertsio eguneratuago bat eskuragarri egotea."</string>

    <string name="unsupported_compile_sdk_show" msgid="1601210057960312248">"Erakutsi beti"</string>

    <string name="unsupported_compile_sdk_check_update" msgid="1103639989147664456">"Bilatu eguneratzea"</string>

    <string name="unsupported_compile_sdk_check_update" msgid="1103639989147664456">"Bilatu eguneratzeak"</string>

    <string name="smv_application" msgid="3775183542777792638">"<xliff:g id="APPLICATION">%1$s</xliff:g> aplikazioak (<xliff:g id="PROCESS">%2$s</xliff:g> prozesua) berak aplikatutako StrictMode gidalerroa urratu du."</string>

    <string name="smv_process" msgid="1398801497130695446">"<xliff:g id="PROCESS">%1$s</xliff:g> prozesuak bere kabuz ezarritako StrictMode gidalerroak urratu ditu."</string>

    <string name="android_upgrading_title" product="default" msgid="7279077384220829683">"Telefonoa eguneratzen ari da…"</string>
@@ -1661,7 +1661,7 @@ 
    <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"Eginbide batetik bestera aldatzeko, pasatu hiru hatz pantailaren behealdetik gora eta eduki sakatuta une batez."</string>

    <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Lupa"</string>

    <string name="user_switched" msgid="7249833311585228097">"Erabiltzailea: <xliff:g id="NAME">%1$s</xliff:g>."</string>

    <string name="user_switching_message" msgid="1912993630661332336">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailera aldatzen…"</string>

    <string name="user_switching_message" msgid="1912993630661332336">"\"<xliff:g id="NAME">%1$s</xliff:g>\" erabiltzailera aldatzen…"</string>

    <string name="user_logging_out_message" msgid="7216437629179710359">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen saioa amaitzen…"</string>

    <string name="owner_name" msgid="8713560351570795743">"Jabea"</string>

    <string name="error_message_title" msgid="4082495589294631966">"Errorea"</string>

core/res/res/values-fr-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1661,7 +1661,7 @@ 
    <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"Pour basculer entre les fonctionnalités, balayez l\'écran vers le haut avec trois doigts et maintenez-les-y."</string>

    <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Zoom"</string>

    <string name="user_switched" msgid="7249833311585228097">"Utilisateur actuel : <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="user_switching_message" msgid="1912993630661332336">"Changement d\'utilisateur (<xliff:g id="NAME">%1$s</xliff:g>) en cours…"</string>

    <string name="user_switching_message" msgid="1912993630661332336">"Passage au profil : <xliff:g id="NAME">%1$s</xliff:g>…"</string>

    <string name="user_logging_out_message" msgid="7216437629179710359">"Déconnexion de <xliff:g id="NAME">%1$s</xliff:g> en cours..."</string>

    <string name="owner_name" msgid="8713560351570795743">"Propriétaire"</string>

    <string name="error_message_title" msgid="4082495589294631966">"Erreur"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -1661,7 +1661,7 @@ 
    <string name="accessibility_gesture_3finger_instructional_text" msgid="3425123684990193765">"Pour changer de fonctionnalité, balayez l\'écran vers le haut avec trois doigts et appuyez de manière prolongée."</string>

    <string name="accessibility_magnification_chooser_text" msgid="1502075582164931596">"Agrandissement"</string>

    <string name="user_switched" msgid="7249833311585228097">"Utilisateur actuel : <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="user_switching_message" msgid="1912993630661332336">"Chargement du profil de <xliff:g id="NAME">%1$s</xliff:g>..."</string>

    <string name="user_switching_message" msgid="1912993630661332336">"Passage au profil : <xliff:g id="NAME">%1$s</xliff:g>..."</string>

    <string name="user_logging_out_message" msgid="7216437629179710359">"Déconnexion de <xliff:g id="NAME">%1$s</xliff:g>…"</string>

    <string name="owner_name" msgid="8713560351570795743">"Propriétaire"</string>

    <string name="error_message_title" msgid="4082495589294631966">"Erreur"</string>

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

+5 −5
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ 
    <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Иесіне оператордың хабар алмасу қызметінің жоғарғы деңгейлі интерфейсіне байластыруға рұқсат етеді. Қалыпты қолданбалар үшін ешқашан қажет болмайды."</string>

    <string name="permlab_bindCarrierServices" msgid="2395596978626237474">"оператор қызметтеріне қосылу"</string>

    <string name="permdesc_bindCarrierServices" msgid="9185614481967262900">"Иесіне оператор қызметтеріне қосылуға мүмкіндік береді. Қалыпты қолданбалар үшін қажет болмайды."</string>

    <string name="permlab_access_notification_policy" msgid="5524112842876975537">"\"Мазаламау\" режиміне кіру"</string>

    <string name="permlab_access_notification_policy" msgid="5524112842876975537">"Мазаламау режиміне кіру"</string>

    <string name="permdesc_access_notification_policy" msgid="8538374112403845013">"Қолданбаға «Мазаламау» конфигурациясын оқу және жазу мүмкіндігін береді."</string>

    <string name="permlab_startViewPermissionUsage" msgid="1504564328641112341">"рұқсаттарды пайдалану туралы деректерді көру"</string>

    <string name="permdesc_startViewPermissionUsage" msgid="2820325605959586538">"Пайдаланушы қолданбаға берілетін рұқсаттарды басқара алады. Ондай рұқсаттар әдеттегі қолданбаларға керек емес."</string>
@@ -1832,7 +1832,7 @@ 
    <string name="zen_mode_until" msgid="2250286190237669079">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін"</string>

    <string name="zen_mode_alarm" msgid="7046911727540499275">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін (келесі дабыл)"</string>

    <string name="zen_mode_forever" msgid="740585666364912448">"Өшірілгенге дейін"</string>

    <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"\"Мазаламау\" режимін өшіргенше"</string>

    <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Мазаламау режимін өшіргенше"</string>

    <string name="zen_mode_rule_name_combination" msgid="7174598364351313725">"<xliff:g id="FIRST">%1$s</xliff:g>/<xliff:g id="REST">%2$s</xliff:g>"</string>

    <string name="toolbar_collapse_description" msgid="8009920446193610996">"Тасалау"</string>

    <string name="zen_mode_feature_name" msgid="3785547207263754500">"Мазаламау"</string>
@@ -1987,10 +1987,10 @@ 
    <string name="volume_dialog_ringer_guidance_vibrate" msgid="2055927873175228519">"Қоңыраулар мен хабарландырулардың вибрациясы болады"</string>

    <string name="volume_dialog_ringer_guidance_silent" msgid="1011246774949993783">"Қоңыраулар мен хабарландырулардың дыбыстық сигналы өшіріледі"</string>

    <string name="notification_channel_system_changes" msgid="2462010596920209678">"Жүйе өзгерістері"</string>

    <string name="notification_channel_do_not_disturb" msgid="7832584281883687653">"\"Мазаламау\" режимі"</string>

    <string name="zen_upgrade_notification_visd_title" msgid="2001148984371968620">"Жаңа: \"Мазаламау\" режимі хабарландыруларды жасыруда"</string>

    <string name="notification_channel_do_not_disturb" msgid="7832584281883687653">"Мазаламау режимі"</string>

    <string name="zen_upgrade_notification_visd_title" msgid="2001148984371968620">"Жаңа: Мазаламау режимі хабарландыруларды жасыруда"</string>

    <string name="zen_upgrade_notification_visd_content" msgid="3683314609114134946">"Толығырақ ақпарат алу және өзгерту үшін түртіңіз."</string>

    <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\"Мазаламау\" режимі өзгерді"</string>

    <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Мазаламау режимі өзгерді"</string>

    <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Түймені түртіп, неге тыйым салынатынын көріңіз."</string>

    <string name="notification_app_name_system" msgid="3045196791746735601">"Жүйе"</string>

    <string name="notification_app_name_settings" msgid="9088548800899952531">"Параметрлер"</string>