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

Commit ee0775ed authored by Fedor Kudasov's avatar Fedor Kudasov
Browse files

Init DisplayInfo with constructor 

Bug: 209459024
Test: m SystemUI-core
Change-Id: Icbda3368c3bee3ff6b08dad0c0c8b70d2d163b61
parent 31c1b8bc

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ import java.util.ArrayList; 
import java.util.HashSet;

import java.util.HashSet;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import java.util.concurrent.atomic.AtomicReference;

import java.util.concurrent.atomic.AtomicReference;
@@ -489,6 +490,11 @@ public class InternetDialogController implements AccessPointController.AccessPoi 




    private Map<Integer, CharSequence> getUniqueSubscriptionDisplayNames(Context context) {

    private Map<Integer, CharSequence> getUniqueSubscriptionDisplayNames(Context context) {

        class DisplayInfo {

        class DisplayInfo {

            DisplayInfo(SubscriptionInfo subscriptionInfo, CharSequence originalName) {

                this.subscriptionInfo = subscriptionInfo;

                this.originalName = originalName;

            }



            public SubscriptionInfo subscriptionInfo;

            public SubscriptionInfo subscriptionInfo;

            public CharSequence originalName;

            public CharSequence originalName;

            public CharSequence uniqueName;

            public CharSequence uniqueName;
@@ -502,12 +508,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
                            // Filter out null values.

                            // Filter out null values.

                            return (i != null && i.getDisplayName() != null);

                            return (i != null && i.getDisplayName() != null);

                        })

                        })

                        .map(i -> {

                        .map(i -> new DisplayInfo(i, i.getDisplayName().toString().trim()));

                            DisplayInfo info = new DisplayInfo();

                            info.subscriptionInfo = i;

                            info.originalName = i.getDisplayName().toString().trim();

                            return info;

                        });





        // A Unique set of display names

        // A Unique set of display names

        Set<CharSequence> uniqueNames = new HashSet<>();

        Set<CharSequence> uniqueNames = new HashSet<>();
@@ -586,7 +587,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
            return "";

            return "";

        }

        }





        int resId = mapIconSets(config).get(iconKey).dataContentDescription;

        int resId = Objects.requireNonNull(mapIconSets(config).get(iconKey)).dataContentDescription;

        if (isCarrierNetworkActive()) {

        if (isCarrierNetworkActive()) {

            SignalIcon.MobileIconGroup carrierMergedWifiIconGroup =

            SignalIcon.MobileIconGroup carrierMergedWifiIconGroup =

                    TelephonyIcons.CARRIER_MERGED_WIFI;

                    TelephonyIcons.CARRIER_MERGED_WIFI;