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

Unverified Commit efdd5e96 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17 

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPIwAKCRDorT+BmrEO
# eMRgAJ0Q8o7JjrD9GZqkXsNKA2DofTwtLQCdGFslwEQr+KHQYHLJdmVsQbWmd8E=
# =0oT6
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:35 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2179 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (9) and Florian Mayer (1)
# Via Automerger Merge Worker (32) and others
* tag 'android-14.0.0_r17':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add flag whether MTE state was forced
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: Iaa94a08e3ead46d8df9791a83c739914a8d672bd
parents 5ba714da 57a01619

bootloader_message/include/bootloader_message/bootloader_message.h

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ struct misc_memtag_message { 
#define MISC_MEMTAG_MODE_MEMTAG_KERNEL 0x4

#define MISC_MEMTAG_MODE_MEMTAG_KERNEL_ONCE 0x8

#define MISC_MEMTAG_MODE_MEMTAG_OFF 0x10

// This is set when the state was overridden forcibly. This does not need to be

// interpreted by the bootloader but is only for bookkeeping purposes so

// userspace knows what to do when the override is undone.

// See system/extras/mtectrl in AOSP for more information.

#define MISC_MEMTAG_MODE_FORCED 0x20



#if (__STDC_VERSION__ >= 201112L) || defined(__cplusplus)

static_assert(sizeof(struct misc_virtual_ab_message) == 64,

tools/recovery_l10n/res/values-pt-rPT/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ 
    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Não é possível carregar o sistema Android. Os seus dados podem estar danificados. Se continuar a receber esta mensagem, pode ter de efetuar uma reposição de dados de fábrica e apagar todos os dados do utilizador armazenados neste dispositivo."</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"Tentar novamente"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Reposição de dados de fábrica"</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Pretende limpar todos os dados do utilizador?\n\n NÃO É POSSÍVEL ANULAR ESTA AÇÃO."</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Quer limpar todos os dados do utilizador?\n\n NÃO É POSSÍVEL ANULAR ESTA AÇÃO."</string>

    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancelar"</string>

</resources>