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

Commit e80c4925 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Don't cast CONNECTING msgs to CONNECTED."

parents aaa7a0ce 74d99aab

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

+3 −3
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    mDataConnectionState = state;

                    modified = true;

                } else {

                    // we're still connected, so send that out if we send anything.

                    state = mDataConnectionState;

                    // leave mDataConnectionState as is and

                    // send out the new status for the APN in question.

                }

            }

            mDataConnectionPossible = isDataConnectivityPossible;
@@ -444,7 +444,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    /**

     * Copy the service state object so they can't mess it up in the local calls

     */

    public void sendServiceState(Record r, ServiceState state) {

    private void sendServiceState(Record r, ServiceState state) {

        try {

            r.callback.onServiceStateChanged(new ServiceState(state));

        } catch (RemoteException ex) {