From 765f25210dab7f56d83f52415ec6e33702c52edc Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Mon, 8 May 2023 17:48:00 -0700 Subject: [PATCH] UidObserverController: Fix incorrect usage of binarySearch return value Arrays.binarySearch does not return -1 in all cases where the value cannot be found. It returns a negative index indicating where the value would be inserted. This was discovered through additional unit testing on master. Bug: 274486653 Test: -- -- atest UidObserverControllerTest (with new tests) -- atest CtsCameraTestCases (CameraEvictionTest) Change-Id: Ifbb7eab343279c74b53d00a3c64cd6236edcad02 --- .../core/java/com/android/server/am/UidObserverController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/UidObserverController.java b/services/core/java/com/android/server/am/UidObserverController.java index 5e41dcd0009e7..a2582083c4097 100644 --- a/services/core/java/com/android/server/am/UidObserverController.java +++ b/services/core/java/com/android/server/am/UidObserverController.java @@ -557,7 +557,7 @@ public class UidObserverController { return true; } - return Arrays.binarySearch(mUids, uid) != -1; + return Arrays.binarySearch(mUids, uid) >= 0; } void addUid(int uid) {