Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451 Change-Id: Ida476028924b3c33f92e98c20fbf3a27f5482b21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 = "
|
||||
|
@@ -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(", "));
|
||||
}
|
||||
|
Reference in New Issue
Block a user