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

Commit 0007fa59 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

Merge "Merge strList only if the list is not null." into main am: 821dadb2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3321253



Change-Id: I49655cbd94e1ea658f1c7c24d9a41de041d0a2c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c3b315b 821dadb2

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();

    }