commit 32697552f2dcebf1e718687402f5728b0ec109db
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 31 01:52:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 31 01:52:32 2018 +0000
tree 2ae7f2b79d9b778211b2618d2dd5227ba86173a9
parent e7a47ab038411e6ce45e73c6355516277aebe88d
parent 72b5616890c1b309f5a5115b90ee7e333f322930

Merge "Minor optimization for CollectionUtils.mapNotNull"

core/java/com/android/internal/util/CollectionUtils.java

diff --git a/core/java/com/android/internal/util/CollectionUtils.java b/core/java/com/android/internal/util/CollectionUtils.java
index 2f2c747..433d14f 100644
--- a/core/java/com/android/internal/util/CollectionUtils.java
+++ b/core/java/com/android/internal/util/CollectionUtils.java
@@ -138,14 +138,14 @@
     public static @NonNull <I, O> List<O> mapNotNull(@Nullable List<I> cur,
             Function<? super I, ? extends O> f) {
         if (isEmpty(cur)) return Collections.emptyList();
-        final ArrayList<O> result = new ArrayList<>();
+        List<O> result = null;
         for (int i = 0; i < cur.size(); i++) {
             O transformed = f.apply(cur.get(i));
             if (transformed != null) {
-                result.add(transformed);
+                result = add(result, transformed);
             }
         }
-        return result;
+        return emptyIfNull(result);
     }
 
     /**