Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d22273 authored by Wink Saville's avatar Wink Saville Committed by jianzhou
Browse files

Update SubscriptionManager API as per API council 

bug: 17575308

Conflicts:
	src/com/android/settings/DataUsageSummary.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Utils.java
	src/com/android/settings/deviceinfo/ImeiInformation.java
	src/com/android/settings/sim/SimSettings.java

Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
parent 7899be0f

src/com/android/settings/sim/SimSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    private boolean needUpdate = false;



    private static List<MultiSimEnablerPreference> mSimEnablers = null;

    private List<SubscriptionInfo> mSelectableSubInfos = null;



    private SubscriptionInfo mCellularData = null;

    private SubscriptionInfo mCalls = null;
@@ -334,7 +335,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 


    private void updateSmsValues() {

        final Preference simPref = findPreference(KEY_SMS);

        final SubInfoRecord sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());

        final SubscriptionInfo sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());

        simPref.setTitle(R.string.sms_messages_title);

        if (mSubInfoList.size() == 1) {

            simPref.setSummary(mSubInfoList.get(0).getDisplayName());