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

Commit 27097a5f authored by Ethan Chen's avatar Ethan Chen Committed by Sam Mortimer
Browse files

LineageParts: getDefaultDataSubId => getDefaultDataSubscriptionId 

* Google updated the method name in SubscriptionManager here:
  https://android.googlesource.com/platform/frameworks/base.git/+/7ea3e8bf8954343d7b243b6a23bcb8339921f3c8%5E%21/
  
Change-Id: Ib1df5385878b3940f5e76f9140c07b4ddefc57a0
parent 3bdb6617

src/org/lineageos/lineageparts/profiles/SetupActionsFragment.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -770,7 +770,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
            int selectedMode = Integer.parseInt(data.getStringExtra(

            int selectedMode = Integer.parseInt(data.getStringExtra(

                    TelephonyUtils.EXTRA_NETWORK_PICKER_PICKED_VALUE));

                    TelephonyUtils.EXTRA_NETWORK_PICKER_PICKED_VALUE));

            int subId = data.getIntExtra(TelephonyUtils.EXTRA_SUBID,

            int subId = data.getIntExtra(TelephonyUtils.EXTRA_SUBID,

                    SubscriptionManager.getDefaultDataSubId());

                    SubscriptionManager.getDefaultDataSubscriptionId());

            ConnectionOverrideItem connItem = (ConnectionOverrideItem) mSelectedItem;

            ConnectionOverrideItem connItem = (ConnectionOverrideItem) mSelectedItem;

            final ConnectionSettings setting = connItem.getSettings();

            final ConnectionSettings setting = connItem.getSettings();

//            final ConnectionSettings setting = mProfile.getConnectionSettingWithSubId(subId);

//            final ConnectionSettings setting = mProfile.getConnectionSettingWithSubId(subId);

src/org/lineageos/lineageparts/profiles/actions/item/ConnectionOverrideItem.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,8 @@ public class ConnectionOverrideItem extends BaseItem { 
            if (mConnectionId == ConnectionSettings.PROFILE_CONNECTION_2G3G4G) { // different options

            if (mConnectionId == ConnectionSettings.PROFILE_CONNECTION_2G3G4G) { // different options

                if (mConnectionSettings.isOverride()) {

                if (mConnectionSettings.isOverride()) {

                    return TelephonyUtils.getNetworkModeString(context,

                    return TelephonyUtils.getNetworkModeString(context,

                            mConnectionSettings.getValue(), SubscriptionManager.getDefaultDataSubId());

                            mConnectionSettings.getValue(),

                            SubscriptionManager.getDefaultDataSubscriptionId());

                } else {

                } else {

                    resId = R.string.profile_action_none;

                    resId = R.string.profile_action_none;

                }

                }