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

Skip to content
Unverified Commit d4f599fb authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35

Android 13.0.0 release 35

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jwQAKCRDorT+BmrEO
# ePHcAJ9pLYS/By5kGBaGQ8Owp3lejXC+AQCeOhlE2p7Ebbkj0pgfDkVESIvsOWo=
# =d3Rx
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 13 19:56:17 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 1587 signatures in the past
#      16 months.  Encrypted 4 messages in the past 14 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 (38) and others
# Via Android (Google) Code Review (149) and others
* tag 'android-13.0.0_r35': (193 commits)
  DO NOT MERGE ANYWHERE
  Fixes background color in SUW fingerprint enrollment
  Import translations. DO NOT MERGE ANYWHERE
  Revert "Use Mockito 4.6.1 API"
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  Updates sfps animations for natural orientation
  [RESTRICT AUTOMERGE] Change the intent flag to immutable
  Adding product string variants on choose lock page
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Renames customization content provider (2/7).
  ...

 Conflicts:
	Android.bp
	res/values/config.xml
	res/xml/my_device_info.xml
	res/xml/sound_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/datausage/AppDataUsage.java
	src/com/android/settings/notification/NotificationVolumePreferenceController.java
	src/com/android/settings/notification/RingVolumePreferenceController.java
	src/com/android/settings/notification/VibrateIconPreferenceController.java

Change-Id: I8a80b5d7c27ec5dad5e2e990f02b9e69846e30b7
parents fe00b549 b420deb9
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