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

Unverified Commit 4c4c3f83 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWvgAKCRDorT+BmrEO
# eFBjAJ96GtOFW6/ppxZqKWkcr9Hi7mNtZwCePXYuvKYGa/vjTruBd61peAisHlg=
# =74+s
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:22 2024 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 2332 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 (11) and others
# Via Automerger Merge Worker (316) and others
* tag 'android-14.0.0_r29': (29 commits)
  updater_sample: tools: import AbOtaPropertyFiles from ota_utils
  Update recovery to use Health AIDL HAL V3.
  support wrist orientation in recovery/fastbootd
  Revert "recovery: fix UI error when directories too many [1/1]"
  Fix removal of fastbootd logo for wear
  Add --keep_memtag_mode for --wipe_data
  recovery: fix UI error when directories too many [1/1]
  MinADB: Companion CL to deprecate tMsg
  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
  recovery: Fix old reference to libsnapshot_snapuserd.
  update_verifier: don't pass an unused command-line argument
  Read brightness-related properties from `ro.recovery.ui`
  Read brightness-related properties from `ro.recovery.ui`
  Use the hermetic gzip instead of minigzip.
  Wear Recovery UI: Adjust for round screens
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  ...

 Conflicts:
	applypatch/vendor_flash_recovery.rc
	fastboot/fastboot.cpp
	install/include/install/wipe_data.h
	minui/graphics.cpp
	minui/include/minui/minui.h
	recovery_ui/include/recovery_ui/ui.h
	recovery_ui/ui.cpp

Change-Id: Idce2cb0fbd70665c771e2a39c4928810be75b2d1
parents 50ee1a36 dccf4426

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "android.hardware.boot-V1-ndk",

        "librecovery_ui",

    ],

METADATA

+1 −7
Original line number Diff line number Diff line 
# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE

#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE

#     DEPENDING ON IT IN YOUR PROJECT. ***

third_party {

  license_note: "would be NOTICE save for OFL in:\n"

  "   fonts/README\n"

  "   fonts/OFL.txt\n"

  license_type: BY_EXCEPTION_ONLY

  license_type: NOTICE

}

applypatch/imgdiff.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
 *

 * To work well with this tool, the gzipped sections of the target image must have been generated

 * using the same deflate encoder that is available in applypatch, namely, the one in the zlib

 * library.  In practice this means that images should be compressed using the "minigzip" tool

 * included in the zlib distribution, not the GNU gzip program.

 * library.  In practice this means that images should be compressed using the toybox "gzip" toy,

 * not the GNU gzip program.

 *

 * An "imgdiff" patch consists of a header describing the chunk structure of the file and any

 * encoding parameters needed for the gzipped chunks, followed by N bsdiff patches, one per chunk.

applypatch/vendor_flash_recovery.rc

+1 −0
Original line number Diff line number Diff line 
service vendor_flash_recovery /vendor/bin/install-recovery.sh

    class main

    oneshot

    user root

    disabled



# update recovery if enabled

etc/init.rc

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ on late-init 
service ueventd /system/bin/ueventd

    critical

    seclabel u:r:ueventd:s0

    user root



service console /system/bin/sh

    class core
@@ -108,20 +109,24 @@ on init && property:ro.debuggable=1 
service charger /system/bin/charger

    critical

    seclabel u:r:charger:s0

    user root



service recovery /system/bin/recovery

    socket recovery stream 422 system system

    seclabel u:r:recovery:s0

    user root



service adbd /system/bin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery

    disabled

    socket adbd stream 660 system system

    seclabel u:r:adbd:s0

    user root



service fastbootd /system/bin/fastbootd

    disabled

    group system

    seclabel u:r:fastbootd:s0

    user root



# Restart adbd so it can run as root

on property:service.adb.root=1