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

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

Snap for 7703768 from 19a2adb3 to sc-qpr1-release 

Change-Id: I5b3be0a49eafe4c6a0e1d2f0613cb2bfb42efefb
parents f240272a 19a2adb3

core/java/android/app/search/Query.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public final class Query implements Parcelable { 
            @NonNull Bundle extras) {

        mInput = input;

        mTimestampMillis = timestampMillis;

        mExtras = extras == null ? extras : new Bundle();

        mExtras = extras != null ? extras : new Bundle();

    }



    /**

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11844,6 +11844,13 @@ public final class Settings { 
        @Readable

        public static final String WIFI_MIGRATION_COMPLETED = "wifi_migration_completed";













        /**













         * Whether UWB should be enabled.













         * @hide













         */













        @Readable













        public static final String UWB_ENABLED = "uwb_enabled";



























        /**















         * Value to specify whether network quality scores and badging should be shown in the UI.















         *

































core/proto/android/providers/settings/global.proto



+2
−1






























Original line number
Diff line number
Diff line








@@ -972,6 +972,7 @@ message GlobalSettingsProto {













    optional SettingProto usb_mass_storage_enabled = 127 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto use_google_mail = 128 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto use_open_wifi_package = 129 [ (android.privacy).dest = DEST_AUTOMATIC ];













    optional SettingProto uwb_enabled = 155 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto vt_ims_enabled = 130 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto wait_for_debugger = 131 [ (android.privacy).dest = DEST_AUTOMATIC ];


























@@ -1065,5 +1066,5 @@ message GlobalSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 155;













    // Next tag = 156;















}
























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



+4
−0






























Original line number
Diff line number
Diff line








@@ -609,6 +609,8 @@













    <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"Gebruik jou vingerafdruk of skermslot om voort te gaan"</string>















  <string-array name="fingerprint_error_vendor">















  </string-array>













    <!-- no translation found for fingerprint_error_vendor_unknown (4170002184907291065) -->













    <skip />















    <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Vingerafdrukikoon"</string>















    <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Gesigslot"</string>















    <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Kwessie met Gesigslot"</string>










@@ -661,6 +663,8 @@













    <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Gebruik jou gesig of skermslot om voort te gaan"</string>















  <string-array name="face_error_vendor">















  </string-array>













    <!-- no translation found for face_error_vendor_unknown (7387005932083302070) -->













    <skip />















    <string name="face_icon_content_description" msgid="465030547475916280">"Gesig-ikoon"</string>















    <string name="permlab_readSyncSettings" msgid="6250532864893156277">"lees sinkroniseer-instellings"</string>















    <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"Laat die program toe om die sinkroniseringinstellings van \'n rekening te lees. Byvoorbeeld, dit kan bepaal of die People-program met \'n rekening gesinkroniseer is."</string>

































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



+4
−0






























Original line number
Diff line number
Diff line








@@ -609,6 +609,8 @@













    <string name="fingerprint_or_screen_lock_dialog_default_subtitle" msgid="5195808203117992200">"ለመቀጠል የጣት አሻራዎን ወይም የማያ ገጽ ቁልፍዎን ይጠቀሙ"</string>















  <string-array name="fingerprint_error_vendor">















  </string-array>













    <!-- no translation found for fingerprint_error_vendor_unknown (4170002184907291065) -->













    <skip />















    <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"የጣት አሻራ አዶ"</string>















    <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"በመልክ መክፈት"</string>















    <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"ከመልክ መክፈት ጋር በተያያዘ ችግር"</string>










@@ -661,6 +663,8 @@













    <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"ለመቀጠል መልክዎን ወይም የማያ ገጽዎን መቆለፊያ ይጠቀሙ"</string>















  <string-array name="face_error_vendor">















  </string-array>













    <!-- no translation found for face_error_vendor_unknown (7387005932083302070) -->













    <skip />















    <string name="face_icon_content_description" msgid="465030547475916280">"የፊት አዶ"</string>















    <string name="permlab_readSyncSettings" msgid="6250532864893156277">"የሥምሪያ ቅንብሮች አንብብ"</string>















    <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"መተግበሪያው የአንድ መለያ የማመሳሰል ቅንብሮችን እንዲያነብ ይፈቅድለታል። ለምሳሌ ይህ የሰዎች መተግበሪያ ከመለያ ጋር መመሳሰሉን አለመመሳሰሉን ሊወስን ይችላል።"</string>