Unverified Commit 7497edd3 authored Jan 13, 2022 by Michael Bestas

Merge tag 'android-12.0.0_r26' into staging/lineage-19.0_merge-android-12.0.0_r26

Android 12.0.0 release 26

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYdSrcgAKCRDorT+BmrEO
# eP/1AJ969s8LLstWuGMQlyYlgDtEZuqtpwCgkRFaJXSxvdq5DJw6LNvrpHTHsr0=
# =1B+A
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jan  4 22:17:54 2022 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 1020 signatures in the past
#      2 months.  Encrypted 4 messages in the past 3 days.
# 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 Deepak Sharma
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r26':
  Fix sorting issue during emergency call attempt.

Change-Id: If87b2aabc1c85e8b398c6e8ea5518e89a87abf84

parents 30593278 97d6fe61

src/com/android/server/telecom/CreateConnectionProcessor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -661,7 +661,7 @@ public class CreateConnectionProcessor implements CreateConnectionResponse {
		}

		// then by hashcode
		return account1.hashCode() - account2.hashCode();
		return Integer.compare(account1.hashCode(), account2.hashCode());
		});
		}