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

Commit 7d8cd0b5 authored by Wink Saville's avatar Wink Saville Committed by Natiq Ahmed
Browse files

Additional changes to SubscriptionManager API as per API council. 

bug: 17575308
Conflicts:
	src/com/android/server/telecom/PhoneAccountRegistrar.java
	src/com/android/server/telecom/RespondViaSmsManager.java

Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
parent 1b80ffd6

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

+3 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 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;



    public PhoneAccountRegistrar(Context context) {
@@ -113,6 +114,7 @@ public final class PhoneAccountRegistrar { 


        mState = new State();

        mContext = context;

        mSubscriptionManager = SubscriptionManager.from(mContext);

        read();

    }
@@ -141,7 +143,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 -1;

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        }

        return Long.parseLong(accountHandle.getId());

    }