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

Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1

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

Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2023-04-10 04:39:34 +00:00
committed by Automerger Merge Worker
parent 996851e310 5240d251e1
commit 09238601fa
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,9 @@ import android.util.ArrayMap;
import android.util.IndentingPrintWriter;
import android.util.Log;
import androidx.annotation.GuardedBy;
import androidx.lifecycle.LifecycleOwner;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -58,13 +61,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import androidx.annotation.GuardedBy;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptionsChangedListener {
private static final String TAG = "MobileNetworkRepository";
@@ -392,6 +388,7 @@ 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 = "