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

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

Snap for 10902624 from 0fa092ac to udc-qpr1-release 

Change-Id: I29bc211e228d40b637b2797dcf944c59d707744c
parents 5b59f2d6 0fa092ac

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

+4 −1
Original line number Diff line number Diff line
@@ -10335,11 +10335,14 @@ public class DevicePolicyManager { 
     * @return the current credential manager policy if null then this policy has not been

     * configured.

     */

    @UserHandleAware(

            enabledSinceTargetSdkVersion = UPSIDE_DOWN_CAKE,

            requiresPermissionIfNotCaller = INTERACT_ACROSS_USERS)

    public @Nullable PackagePolicy getCredentialManagerPolicy() {

        throwIfParentInstance("getCredentialManagerPolicy");

        if (mService != null) {

            try {

                return mService.getCredentialManagerPolicy();

                return mService.getCredentialManagerPolicy(myUserId());

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ interface IDevicePolicyManager { 
    boolean hasManagedProfileCallerIdAccess(int userId, String packageName);



    void setCredentialManagerPolicy(in PackagePolicy policy);

    PackagePolicy getCredentialManagerPolicy();

    PackagePolicy getCredentialManagerPolicy(int userId);



    void setManagedProfileContactsAccessPolicy(in PackagePolicy policy);

    PackagePolicy getManagedProfileContactsAccessPolicy();

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

+1 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ 
    <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Aplikazioak ez du grabatzeko baimenik, baina baliteke audioa grabatzea USB bidezko gailu horren bidez."</string>

    <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Pantaila nagusia"</string>

    <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Atzera"</string>

    <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Erabilitako azken aplikazioak"</string>

    <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Azkenaldian erabilitako aplikazioak"</string>

    <string name="accessibility_system_action_notifications_label" msgid="6083767351772162010">"Jakinarazpenak"</string>

    <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"Ezarpen bizkorrak"</string>

    <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"Piztu edo itzaltzeko leihoa"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ 
    <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"వేలిముద్ర చిహ్నం"</string>

    <string name="device_unlock_notification_name" msgid="2632928999862915709">"పరికర అన్‌లాక్"</string>

    <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"అన్‌లాక్ చేయడానికి మరొక మార్గాన్ని ట్రై చేయండి"</string>

    <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"మీ వేలిముద్ర గుర్తించబడనప్పుడు, మీ వేళ్లు తడిగా ఉన్నప్పుడు ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి"</string>

    <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"మీ వేళ్లు తడిగా ఉండటం లేక ఇతరత్రా కారణాల వల్ల మీ వేలిముద్రను గుర్తించకపోతే, ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి"</string>

    <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"మీ ఫేస్ గుర్తించబడనప్పుడు, తగినంత వెలుతురు లేనప్పుడు వేలిముద్ర అన్‌లాక్‌ను ఉపయోగించండి"</string>

    <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"ఫేస్ అన్‌లాక్"</string>

    <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"ఫేస్ అన్‌లాక్‌తో సమస్య"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ 
    <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Значок відбитка пальця"</string>

    <string name="device_unlock_notification_name" msgid="2632928999862915709">"Розблокування пристрою"</string>

    <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"Спробуйте інший спосіб розблокування"</string>

    <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Розблоковуйте пристрій за допомогою фейс-контролю, коли не вдається розпізнати ваш відбиток пальця (наприклад, коли у вас мокрі пальці)"</string>

    <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Якщо пристрій не розпізнає ваш відбиток пальця (наприклад, коли у вас мокрі руки), використовуйте фейс-контроль"</string>

    <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Розблоковуйте пристрій відбитком пальця, коли не вдається розпізнати ваше обличчя (наприклад, коли недостатньо світла)"</string>

    <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Фейс-контроль"</string>

    <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Сталася помилка з фейсконтролем"</string>