commit | f6e1ed9eed39b120c48deff3290fe275eb6cbd31 | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Dec 02 00:22:51 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 02 00:22:51 2021 +0000 |
tree | f987be8fbd24eaf4f40ca6736e71e4252fffb6d3 | |
parent | c9c6a43623b1593f708a61d92075aecce53f6721 [diff] | |
parent | 97d6fe61f21787aa03d249a68178d6dc8c3b0f89 [diff] |
Merge cherrypicks of [16373492] into sc-qpr1-release. am: 97d6fe61f2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16374489 Change-Id: I33ee42be14e5f4203bc143a15fa18adca5af06dd
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java index 2e67b08..e3b8dee 100644 --- a/src/com/android/server/telecom/CreateConnectionProcessor.java +++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -661,7 +661,7 @@ } // then by hashcode - return account1.hashCode() - account2.hashCode(); + return Integer.compare(account1.hashCode(), account2.hashCode()); }); }