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

Commit d6c8cbb3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge " Update Messenger object based on current DDS."

parents 0cd5ce2b 5c06af31

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

+14 −10
Original line number Diff line number Diff line
@@ -181,17 +181,8 @@ public class DcTracker extends DcTrackerBase { 
            filter.addAction(INTENT_RESTART_TRYSETUP_ALARM + '.' + apnContext.getDataProfileType());

            mPhone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone);

        }

        supplyMessenger();



        ConnectivityManager cm = (ConnectivityManager)p.getContext().getSystemService(

                Context.CONNECTIVITY_SERVICE);

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_MMS, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_SUPL, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_DUN, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_HIPRI, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_FOTA, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_IMS, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_CBS, new Messenger(this));

    }



    @Override
@@ -268,6 +259,19 @@ public class DcTracker extends DcTrackerBase { 
        return apnContext;

    }



    protected void supplyMessenger() {

        ConnectivityManager cm = (ConnectivityManager)mPhone.getContext().getSystemService(

                Context.CONNECTIVITY_SERVICE);

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_MMS, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_SUPL, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_DUN, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_HIPRI, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_FOTA, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_IMS, new Messenger(this));

        cm.supplyMessenger(ConnectivityManager.TYPE_MOBILE_CBS, new Messenger(this));

    }



    protected void initApnContextsAndDataConnection() {

        boolean defaultEnabled = SystemProperties.getBoolean(DEFALUT_DATA_ON_BOOT_PROP, true);

        // Load device network attributes from resources