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

Commit 261a252a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451



Change-Id: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d7e22ee b98d6644

src/com/android/settings/network/MobileNetworkRepository.java

+0 −1
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions 
        mActiveSubInfoEntityList = availableSubInfoEntityList.stream()

                .filter(SubscriptionInfoEntity::isActiveSubscription)

                .filter(SubscriptionInfoEntity::isSubscriptionVisible)

                .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))

                .collect(Collectors.toList());

        if (DEBUG) {

            Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = "

src/com/android/settings/network/MobileNetworkSummaryController.java

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 
            return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);

        } else {

            return mSubInfoEntityList.stream()

                    .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))

                    .map(SubscriptionInfoEntity::getUniqueDisplayName)

                    .collect(Collectors.joining(", "));

        }