Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de3ce48 authored by Cole Faust's avatar Cole Faust
Browse files

Replace .toList() with .collect() 

.toList() was only introduced to android in api level 34, which is newer than
this module's min_sdk_version. Replace it with .collect().

This was found while updating android lint.

Flag: EXEMPT refactor
Bug: 394096385
Test: Presubmits
Change-Id: Ia1cc4a7c2aac3a391b847723e4ef5aa44d8f1c8c
parent ffc9e219

viewcapturelib/src/com/android/app/viewcapture/ViewCapture.java

+11 −5
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import java.util.concurrent.Executor; 
import java.util.concurrent.TimeUnit;

import java.util.function.Consumer;

import java.util.function.Predicate;

import java.util.stream.Collectors;



/**

 * Utility class for capturing view data every frame
@@ -206,7 +207,7 @@ public abstract class ViewCapture { 
    }



    private static List<String> toStringList(List<Class> classList) {

        return classList.stream().map(Class::getName).toList();

        return classList.stream().map(Class::getName).collect(Collectors.toList());

    }



    public CompletableFuture<Optional<MotionWindowData>> getDumpTask(View view) {
@@ -223,9 +224,14 @@ public abstract class ViewCapture { 
    private CompletableFuture<List<WindowData>> getWindowData(Context context,

            ArrayList<Class> outClassList, Predicate<WindowListener> filter) {

        ViewIdProvider idProvider = new ViewIdProvider(context.getResources());

        return CompletableFuture.supplyAsync(() ->

                mListeners.stream().filter(filter).toList(), MAIN_EXECUTOR).thenApplyAsync(it ->

                        it.stream().map(l -> l.dumpToProto(idProvider, outClassList)).toList(),

        return CompletableFuture.supplyAsync(

                () -> mListeners.stream()

                        .filter(filter)

                        .collect(Collectors.toList()),

                MAIN_EXECUTOR).thenApplyAsync(

                        it -> it.stream()

                                .map(l -> l.dumpToProto(idProvider, outClassList))

                                .collect(Collectors.toList()),

                        mBgExecutor);

    }