diff options
| author | Rui Qiu <ruiqiu@google.com> | 2022-03-02 13:43:24 -0800 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-03-04 20:06:01 +0000 |
| commit | beb3fccfeaf983a98e9e809642b636a3f2f35f38 (patch) | |
| tree | c5e4a339776cff51a4ee8b5cbde1b6da576e0444 | |
| parent | da2573d3539d374906af5836050e5688a614b9eb (diff) | |
| download | Car-beb3fccfeaf983a98e9e809642b636a3f2f35f38.tar.gz | |
Prevent NPE in ResultStore
Bug: 222340183
Test: atest com.android.car.telemetry
Test: atest CarServiceTest
Change-Id: Ic620d36d453c631ca48fb7106441ffbd43aaaf63
(cherry picked from commit 310ee863e972a692e15d2fd8926ea022bdc4f8f5)
Merged-In: Ic620d36d453c631ca48fb7106441ffbd43aaaf63
| -rw-r--r-- | service/src/com/android/car/telemetry/ResultStore.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/service/src/com/android/car/telemetry/ResultStore.java b/service/src/com/android/car/telemetry/ResultStore.java index 0fc39564df..5423673668 100644 --- a/service/src/com/android/car/telemetry/ResultStore.java +++ b/service/src/com/android/car/telemetry/ResultStore.java @@ -280,11 +280,13 @@ public class ResultStore { configNames.addAll(mFinalResultCache.keySet()); configNames.addAll(mErrorCache.keySet()); // prevent NPE - if (mFinalResultDirectory.list() != null) { - configNames.addAll(Arrays.asList(mFinalResultDirectory.list())); + String[] fileNames = mFinalResultDirectory.list(); + if (fileNames != null) { + configNames.addAll(Arrays.asList(fileNames)); } - if (mErrorResultDirectory.list() != null) { - configNames.addAll(Arrays.asList(mErrorResultDirectory.list())); + fileNames = mErrorResultDirectory.list(); + if (fileNames != null) { + configNames.addAll(Arrays.asList(fileNames)); } return configNames; } |