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

Commit 8ece3445 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8061 into donut 

* changes:
  Throw a connecting exception when timed out.
parents db7db69a bb221924

packages/VpnServices/src/com/android/server/vpn/VpnService.java

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ abstract class VpnService<E extends VpnProfile> { 


    synchronized void onDisconnect(boolean cleanUpServices) {

        try {

            Log.d(TAG, "       disconnecting VPN...");

            mState = VpnState.DISCONNECTING;

            broadcastConnectivity(VpnState.DISCONNECTING);

            mNotification.showDisconnect();
@@ -217,6 +218,8 @@ abstract class VpnService<E extends VpnProfile> { 
                synchronized (VpnService.this) {

                    if (mState == VpnState.CONNECTING) {

                        Log.d(TAG, "       connecting timed out !!");

                        mError = newConnectingError(

                                new IOException("Connecting timed out"));

                        onError();

                    }

                }