am 7b98b666: Merge change 20738 into donut

Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7'

* commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7':
  Fix a bug in getSocketError() in VpnService.

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnService.java b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
index 5524ee588ffe..e3ac996fc679 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
@@ -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;