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

Commit 81becd1a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add javadoc and deprecate... 

Merge "Add javadoc and deprecate addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener)" am: 35c5908f am: 0b0e2a7a

Change-Id: Iec10c9a1967976dd2e606297a6505c479aeaeca3
parents afebffee 0b0e2a7a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -48045,7 +48045,7 @@ package android.telephony { 














  public class SubscriptionManager {















    method public void addOnOpportunisticSubscriptionsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);













    method public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);













    method @Deprecated public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);















    method public void addOnSubscriptionsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void addSubscriptionsIntoGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid);















    method public boolean canManageSubscription(android.telephony.SubscriptionInfo);

























telephony/java/android/telephony/SubscriptionManager.java



+5
−1




























Original line number
Diff line number
Diff line








@@ -973,11 +973,15 @@ public class SubscriptionManager {













     * individual records themselves. When a change occurs the onSubscriptionsChanged method of















     * the listener will be invoked immediately if there has been a notification. The















     * onSubscriptionChanged method will also be triggered once initially when calling this













     * function.













     * function. The callback will be invoked on the looper specified in the listener's constructor.















     *















     * @param listener an instance of {@link OnSubscriptionsChangedListener} with















     *                 onSubscriptionsChanged overridden.













     *













     * @deprecated Will get exception if the parameter listener is not initialized with a Looper.













     * Use {@link #addOnSubscriptionsChangedListener(Executor, OnSubscriptionsChangedListener)}.















     */













    @Deprecated















    public void addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {















        if (listener == null) return;















        addOnSubscriptionsChangedListener(listener.mExecutor, listener);