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

Commit 06ba596b authored by Wink Saville's avatar Wink Saville Committed by Natiq Ahmed
Browse files

Rename reg/unreg OnSubscriptionsChangedListener 

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
parent 86d68384

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        context.registerReceiverAsUser(mBroadcastAllReceiver, UserHandle.ALL, allUserFilter,

                null, null);



        mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener);

        mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener);

        try {

            ActivityManagerNative.getDefault().registerUserSwitchObserver(

                    new IUserSwitchObserver.Stub() {

services/core/java/com/android/server/TelephonyRegistry.java

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    }



    @Override

    public void registerOnSubscriptionsChangedListener(String pkgForDebug,

    public void addOnSubscriptionsChangedListener(String pkgForDebug,

            IOnSubscriptionsChangedListener callback) {

        int callerUid = UserHandle.getCallingUserId();

        int myUid = UserHandle.myUserId();
@@ -393,7 +393,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    }



    @Override

    public void unregisterOnSubscriptionsChangedListener(String pkgForDebug,

    public void removeOnSubscriptionsChangedListener(String pkgForDebug,

            IOnSubscriptionsChangedListener callback) {

        if (DBG) log("listen oscl: Unregister");

        remove(callback.asBinder());

telephony/java/android/telephony/SubscriptionManager.java

+6 −6
Original line number Diff line number Diff line
@@ -296,9 +296,9 @@ public class SubscriptionManager { 
     * A listener class for monitoring changes to {@link SubscriptionInfo} records.

     * <p>

     * Override the onSubscriptionsChanged method in the object that extends this

     * class and pass it to {@link #registerOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)}

     * class and pass it to {@link #addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)}

     * to register your listener and to unregister invoke

     * {@link #unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)}

     * {@link #removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener)}

     * <p>

     * Permissions android.Manifest.permission.READ_PHONE_STATE is required

     * for #onSubscriptionsChanged to be invoked.
@@ -370,7 +370,7 @@ public class SubscriptionManager { 
     * @param listener an instance of {@link OnSubscriptionsChangedListener} with

     *                 onSubscriptionsChanged overridden.

     */

    public void registerOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {

    public void addOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {

        String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>";

        if (DBG) {

            logd("register OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug
@@ -382,7 +382,7 @@ public class SubscriptionManager { 
            ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(

                    "telephony.registry"));

            if (tr != null) {

                tr.registerOnSubscriptionsChangedListener(pkgForDebug, listener.callback);

                tr.addOnSubscriptionsChangedListener(pkgForDebug, listener.callback);

            }

        } catch (RemoteException ex) {

            // Should not happen
@@ -396,7 +396,7 @@ public class SubscriptionManager { 
     *

     * @param listener that is to be unregistered.

     */

    public void unregisterOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {

    public void removeOnSubscriptionsChangedListener(OnSubscriptionsChangedListener listener) {

        String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>";

        if (DBG) {

            logd("unregister OnSubscriptionsChangedListener pkgForDebug=" + pkgForDebug
@@ -408,7 +408,7 @@ public class SubscriptionManager { 
            ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(

                    "telephony.registry"));

            if (tr != null) {

                tr.unregisterOnSubscriptionsChangedListener(pkgForDebug, listener.callback);

                tr.removeOnSubscriptionsChangedListener(pkgForDebug, listener.callback);

            }

        } catch (RemoteException ex) {

            // Should not happen

telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ import com.android.internal.telephony.IPhoneStateListener; 
import com.android.internal.telephony.IOnSubscriptionsChangedListener;



interface ITelephonyRegistry {

    void registerOnSubscriptionsChangedListener(String pkg,

    void addOnSubscriptionsChangedListener(String pkg,

            IOnSubscriptionsChangedListener callback);

    void unregisterOnSubscriptionsChangedListener(String pkg,

    void removeOnSubscriptionsChangedListener(String pkg,

            IOnSubscriptionsChangedListener callback);

    void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow);

    void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events,