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" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e am: 9aa950e0d9

Browse Source 
Change-Id: Ie13d45d59660e9e46ad168eefc2ae938cfc1f7c4
This commit is contained in:
Automerger Merge Worker
2020-03-11 14:03:58 +00:00
parent cf13163981 9aa950e0d9
commit 607ecefc8c
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

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