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

Skip to content
Commit 1e271bc8 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eFDIAKCOeYTtdt0egok4UBTocTSNNkLmeACeLgNUHO1UvOSfTGYN/LnaoG9W0Dc=
# =pH//
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 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 2469 signatures in the past
#      3 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 (94) and others
# Via Automerger Merge Worker (783) and others
* tag 'android-15.0.0_r6': (743 commits)
  [Homepage Revamp] hide the scroll bar of homepage
  Don't show default payment component in search if Wallet role is enabled
  Avoid using MANDATORY_BIOMETRICS bit if flag is not enabled
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix Can't Able to Click Sims
  Fix for broken tests in Accessibility Settings
  Change "Open by default" setting page selection to radio buttons
  [Settings] Fix crash
  remove the DSDS dialog
  Migrate "Build number" preference
  Migrate "Kernel version" preference
  Migrate "Baseband version" preference
  Rename AudioSharingRetryDialogFragment
  Rename AudioSharingLoadingStateDialogFragment and layout
  Check canEnterMobileNetworkPage
  Check DISALLOW_CONFIG_MOBILE_NETWORKS when search
  [Audiosharing] Show retry dialog when error occurs in start sharing
  Update color-check-baseline.xml
  ...

 Conflicts:
	Android.bp
	AndroidManifest.xml
	src/com/android/settings/accessibility/AccessibilitySettings.java
	src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
	src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManager.java
	src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
	src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
	src/com/android/settings/wifi/WifiConfigController2.java
	tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

Change-Id: Ideece6940ede6a9247a02dff00f802af84202cb7
parents 4921d793 f808bfa3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment