PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-30 04:05:22 +00:00
committed by Android (Google) Code Review
parent 94906cfe3d f2bf350303
commit b98d6644ed
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -433,7 +433,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mActiveSubInfoEntityList = availableSubInfoEntityList.stream() mActiveSubInfoEntityList = availableSubInfoEntityList.stream()
.filter(SubscriptionInfoEntity::isActiveSubscription) .filter(SubscriptionInfoEntity::isActiveSubscription)
.filter(SubscriptionInfoEntity::isSubscriptionVisible) .filter(SubscriptionInfoEntity::isSubscriptionVisible)
.sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = " Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = "

1
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -134,7 +134,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
return mContext.getString(R.string.mobile_network_tap_to_activate, displayName); return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
} else { } else {
return mSubInfoEntityList.stream() return mSubInfoEntityList.stream()
.sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
.map(SubscriptionInfoEntity::getUniqueDisplayName) .map(SubscriptionInfoEntity::getUniqueDisplayName)
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
} }