diff options
| author | 2024-08-27 21:19:56 +0000 | |
|---|---|---|
| committer | 2024-08-29 18:55:06 +0000 | |
| commit | c9c2ea0f019be97169416f0d9c45ed9ab1dd45fb (patch) | |
| tree | c9e9bf295b6a67dc416db50ddfe63f0716f3cd71 | |
| parent | fc990b40b47dc6df666f56c1b080a8a1f991a372 (diff) | |
If the attempt to read ObservableUuid data from
disk results in no data being found (or an error occurs),
return an empty list instead of null
Test: cts
Fix: 362184526
Flag: EXEMPT bugfix
Change-Id: I08699a7c6f09b2e405e57d020dab54655c861f95
| -rw-r--r-- | services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java b/services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java index 4678a165b83f..5fd282df97ec 100644 --- a/services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java +++ b/services/companion/java/com/android/server/companion/devicepresence/ObservableUuidStore.java @@ -190,7 +190,7 @@ public class ObservableUuidStore { } mCachedPerUser.set(userId, cachedObservableUuids); } - return cachedObservableUuids; + return cachedObservableUuids == null ? new ArrayList<>() : cachedObservableUuids; } /** |