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

Commit 77208f85 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 7b98b666: Merge change 20738 into donut 

Merge commit '7b98b666'

* commit '7b98b666':
  Fix a bug in getSocketError() in VpnService.
parents cff53466 7b98b666

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

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ abstract class VpnService<E extends VpnProfile> implements Serializable { 
            for (DaemonProxy s : mDaemonList) {

                switch (getResultFromSocket(s)) {

                    case 0:

                        return 0;

                        continue;



                    case AUTH_ERROR_CODE:

                        return VpnManager.VPN_ERROR_AUTH;