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

Commit e06245ad 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 228fbbc2

src/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public abstract class ServiceStateTracker extends Handler { 


        mSubscriptionManager = SubscriptionManager.from(phoneBase.getContext());

        mSubscriptionManager

            .registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

            .addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);



        mPhoneBase.setSystemProperty(TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE,

            ServiceState.rilRadioTechnologyToString(ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN));
@@ -265,7 +265,7 @@ public abstract class ServiceStateTracker extends Handler { 
        mUiccController.unregisterForIccChanged(this);

        mCi.unregisterForCellInfoList(this);

        mSubscriptionManager

            .unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

            .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

    }



    public boolean getDesiredPowerState() {

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+2 −2
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ public abstract class DcTrackerBase extends Handler { 


        mSubscriptionManager = SubscriptionManager.from(mPhone.getContext());

        mSubscriptionManager

                .registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

                .addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);



        HandlerThread dcHandlerThread = new HandlerThread("DcHandlerThread");

        dcHandlerThread.start();
@@ -634,7 +634,7 @@ public abstract class DcTrackerBase extends Handler { 
            mDataRoamingSettingObserver.unregister();

        }

        mSubscriptionManager

                .unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

                .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mDcc.dispose();

        mDcTesterFailBringUpAll.dispose();

    }

src/java/com/android/internal/telephony/dataconnection/DctController.java

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ public class DctController extends Handler { 
                new IntentFilter(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED));



        mSubMgr = SubscriptionManager.from(mContext);

        mSubMgr.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mSubMgr.addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);



        //Register for settings change.

        mContext.getContentResolver().registerContentObserver(
@@ -340,7 +340,7 @@ public class DctController extends Handler { 
        mContext.unregisterReceiver(defaultDdsBroadcastReceiver);

        mContext.unregisterReceiver(subInfoBroadcastReceiver);



        mSubMgr.unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mSubMgr.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mContext.getContentResolver().unregisterContentObserver(mObserver);

    }