commit 4f64285184fbad85a0a554f3cefa821846be8002
author Deepak Sharma <deepak.s27@samsung.com> Thu Nov 25 23:21:40 2021 +0000
committer Tyler Gunn <tgunn@google.com> Wed Dec 01 21:37:29 2021 +0000
tree 575616e0233557648c051980e9f0e70f84d8483e
parent 1aadaf8e1a5b42744097fbcf623a6c4faf25722a

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)

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 6c92724..89200ad 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -593,7 +593,7 @@
             }
 
             // then by hashcode
-            return account1.hashCode() - account2.hashCode();
+            return Integer.compare(account1.hashCode(), account2.hashCode());
         });
     }