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

Merge "Fix Card 2's pin shows ON when only turn on card 1's pin"

Browse Source
This commit is contained in:
Zoey Chen
2020-03-11 12:54:05 +00:00
committed by Gerrit Code Review
parent 7ef5614ee2 3bfbb818c7
commit 23c382aa45
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/IccLockSettings.java
View File

@@ -122,6 +122,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
// @see android.widget.Toast$TN // @see android.widget.Toast$TN
private static final long LONG_DURATION_TIMEOUT = 7000; private static final long LONG_DURATION_TIMEOUT = 7000;
private int mSlotId;
private int mSubId; private int mSubId;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
@@ -218,6 +219,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
Bundle savedInstanceState) { Bundle savedInstanceState) {
final int numSims = mProxySubscriptionMgr.getActiveSubscriptionInfoCountMax(); final int numSims = mProxySubscriptionMgr.getActiveSubscriptionInfoCountMax();
mSlotId = 0;
if (numSims > 1) { if (numSims > 1) {
final View view = inflater.inflate(R.layout.icc_lock_tabs, container, false); final View view = inflater.inflate(R.layout.icc_lock_tabs, container, false);
final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container); final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
@@ -243,7 +245,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
? getContext().getString(R.string.sim_editor_title, i + 1) ? getContext().getString(R.string.sim_editor_title, i + 1)
: subInfo.getDisplayName()))); : subInfo.getDisplayName())));
} }
final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, 0); final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(
subInfoList, mSlotId);
mSubId = sir.getSubscriptionId(); mSubId = sir.getSubscriptionId();
if (savedInstanceState != null && savedInstanceState.containsKey(CURRENT_TAB)) { if (savedInstanceState != null && savedInstanceState.containsKey(CURRENT_TAB)) {
@@ -265,7 +268,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
mProxySubscriptionMgr.getActiveSubscriptionsInfo(); mProxySubscriptionMgr.getActiveSubscriptionsInfo();
final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, 0); final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, mSlotId);
mSubId = sir.getSubscriptionId(); mSubId = sir.getSubscriptionId();
if (mPinDialog != null) { if (mPinDialog != null) {
@@ -651,9 +654,9 @@ public class IccLockSettings extends SettingsPreferenceFragment
private OnTabChangeListener mTabListener = new OnTabChangeListener() { private OnTabChangeListener mTabListener = new OnTabChangeListener() {
@Override @Override
public void onTabChanged(String tabId) { public void onTabChanged(String tabId) {
final int slotId = Integer.parseInt(tabId); mSlotId = Integer.parseInt(tabId);
final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex( final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(
mProxySubscriptionMgr.getActiveSubscriptionsInfo(), slotId); mProxySubscriptionMgr.getActiveSubscriptionsInfo(), mSlotId);
// The User has changed tab; update the body. // The User has changed tab; update the body.
updatePreferences(); updatePreferences();