diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-05-05 15:26:13 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2017-05-05 15:26:25 -0600 |
| commit | 2abd66c4ffdb7905128b1ca245d4ccb97cbda1c8 (patch) | |
| tree | 70d0080c5a63db021d96c416a0a94b49052abd8b /core/java | |
| parent | e44125cd3a5fc25306285bdfcacc00459e01307b (diff) | |
Defeat @Nullable String[] with empty list.
Test: builds, boots
Bug: 37577123
Change-Id: I6bf1af565398c30aecc0939a23846c0f85c13ffe
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/util/ArrayUtils.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java index 73886a700c7f..91bc6813c5fc 100644 --- a/core/java/com/android/internal/util/ArrayUtils.java +++ b/core/java/com/android/internal/util/ArrayUtils.java @@ -583,4 +583,8 @@ public class ArrayUtils { } return size - leftIdx; } + + public static @NonNull String[] defeatNullable(@Nullable String[] val) { + return (val != null) ? val : EmptyArray.STRING; + } } |