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

Commit 2589325c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Register for unthrottle changes"

parents 392d6c34 b3d05c2e

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

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ public class DataServiceManager extends Handler { 
                mIDataService.createDataServiceProvider(mPhone.getPhoneId());

                mIDataService.registerForDataCallListChanged(mPhone.getPhoneId(),

                        new CellularDataServiceCallback("dataCallListChanged"));

                mIDataService.registerForUnthrottleApn(mPhone.getPhoneId(),

                        new CellularDataServiceCallback("unthrottleApn"));

            } catch (RemoteException e) {

                mDeathRecipient.binderDied();

                loge("Remote exception. " + e);

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

+6 −3
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ public class DcTracker extends Handler { 
        registerServiceStateTrackerEvents();

        mDataServiceManager.registerForServiceBindingChanged(this,

                DctConstants.EVENT_DATA_SERVICE_BINDING_CHANGED, null);

        mDataServiceManager.registerForApnUnthrottled(this, DctConstants.EVENT_APN_UNTHROTTLED);

    }



    public void dispose() {
@@ -880,6 +881,7 @@ public class DcTracker extends Handler { 
        mDataServiceManager.unregisterForServiceBindingChanged(this);

        mDataEnabledSettings.unregisterForDataEnabledChanged(this);

        mDataEnabledSettings.unregisterForDataEnabledOverrideChanged(this);

        mDataServiceManager.unregisterForApnUnthrottled(this);

    }



    /**
@@ -2424,8 +2426,7 @@ public class DcTracker extends Handler { 
        }

    }



    private void onApnUnthrottled(Message msg) {

        String apn = (String) msg.obj;

    private void onApnUnthrottled(String apn) {

        if (apn != null) {

            ApnContext ac = mApnContexts.get(apn);

            if (ac != null) {
@@ -3974,7 +3975,9 @@ public class DcTracker extends Handler { 
                onSimStateUpdated(simState);

                break;

            case DctConstants.EVENT_APN_UNTHROTTLED:

                onApnUnthrottled(msg);

                ar = (AsyncResult) msg.obj;

                String apn = (String) ar.result;

                onApnUnthrottled(apn);

                break;

            default:

                Rlog.e("DcTracker", "Unhandled event=" + msg);