From 4e32727c0109410fbca1631d70dfb072796f9048 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Wed, 27 Apr 2022 08:55:45 +0800
Subject: [PATCH] [Settings] Link to incorrect SIM after SIM swap

A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).

Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
---
 .../settings/network/SubscriptionsPreferenceController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 218e3ecb4ba..44ad411c832 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -232,11 +232,11 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
                 connectCarrierNetwork();
                 return true;
             });
-
-            mSubsGearPref.setOnGearClickListener(p ->
-                    MobileNetworkUtils.launchMobileNetworkSettings(mContext, subInfo));
         }
 
+        mSubsGearPref.setOnGearClickListener(p ->
+                MobileNetworkUtils.launchMobileNetworkSettings(mContext, subInfo));
+
         if (!(mContext.getSystemService(UserManager.class)).isAdminUser()) {
             mSubsGearPref.setGearEnabled(false);
         }