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

Commit 51ddfefd authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Merge strList only if the list is not null." into main

parents 7401434c dd2d4ccd

src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java

+8 −2
Original line number Diff line number Diff line
@@ -327,8 +327,14 @@ public class SatelliteServiceUtils { 
    @NonNull

    public static List<String> mergeStrLists(List<String> strList1, List<String> strList2) {

        Set<String> mergedStrSet = new HashSet<>();

        if (strList1 != null) {

            mergedStrSet.addAll(strList1);

        }



        if (strList2 != null) {

            mergedStrSet.addAll(strList2);

        }



        return mergedStrSet.stream().toList();

    }