commit 6ec2d83ae2a60d3f5f2f842941caa22b511a0b4a
author Deepak Sharma <deepak.s27@samsung.com> Thu Nov 25 23:21:40 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 25 00:35:02 2021 +0000
tree 760587a3be02180c3f888897794bde4764f51d3f
parent c4d173b67bc16c054015d9d8930317e387e79c93

Fix sorting issue during emergency call attempt.

Fix the integer overflow/underflow caused by sorting of duplicate phoneaccounts during emergency call attempt. 

Bug: 208267659
Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1903050
Merged-In: I3529e4f86ba5690a8c2e72d6103a84c00bf3f358
Change-Id: I3529e4f86ba5690a8c2e72d6103a84c00bf3f358
Test: Added unit test (see https://googleplex-android-review.git.corp.google.com/c/platform/packages/services/Telecomm/+/16372187)
Test: Manual testing performed to confirm that this corrects repro.
(cherry picked from commit e20b83ec9b3dc2bc5a49a666bd057cf45ce99f15)
(cherry picked from commit 4f64285184fbad85a0a554f3cefa821846be8002)
Merged-In:I3529e4f86ba5690a8c2e72d6103a84c00bf3f358

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

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());
         });
     }