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

Commit d45da143 authored by Wink Saville's avatar Wink Saville
Browse files

Revert "Additional changes to SubscriptionManager API as per API council." 

This reverts commit fe081559.

Change-Id: I4259933c688b6e70df149cc50d83254217fe8f78
parent fe081559

src/com/android/server/telecom/PhoneAccountRegistrar.java

+2 −4
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public final class PhoneAccountRegistrar { 
    private final List<Listener> mListeners = new CopyOnWriteArrayList<>();

    private final AtomicFile mAtomicFile;

    private final Context mContext;

    private final SubscriptionManager mSubscriptionManager;

    private State mState;



    @VisibleForTesting
@@ -114,7 +113,6 @@ public final class PhoneAccountRegistrar { 


        mState = new State();

        mContext = context;

        mSubscriptionManager = SubscriptionManager.from(mContext);

        read();

    }
@@ -132,7 +130,7 @@ public final class PhoneAccountRegistrar { 
                !TextUtils.isDigitsOnly(accountHandle.getId())) {

            // Since no decimals or negative numbers can be valid subscription ids, only a string of

            // numbers can be subscription id

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            return SubscriptionManager.INVALID_SUB_ID;

        }

        return Integer.parseInt(accountHandle.getId());

    }
@@ -214,7 +212,7 @@ public final class PhoneAccountRegistrar { 
                // If the account selected is a SIM account, propagate down to the subscription

                // record.

                int subId = getSubscriptionIdForPhoneAccount(accountHandle);

                mSubscriptionManager.setDefaultVoiceSubId(subId);

                SubscriptionManager.setDefaultVoiceSubId(subId);

            }



            mState.defaultOutgoing = accountHandle;

src/com/android/server/telecom/RespondViaSmsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class RespondViaSmsManager extends CallsManagerListenerBase { 
                final Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null);

                final Intent intent = new Intent(TelephonyManager.ACTION_RESPOND_VIA_MESSAGE, uri);

                intent.putExtra(Intent.EXTRA_TEXT, textMessage);

                if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                if (subId != SubscriptionManager.INVALID_SUB_ID) {

                    intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

                }