commit ba3f4c3bed0c5232c15a6de06b9beb5f59f0185d
author Jeff Davidson <jpd@google.com> Wed Jul 23 18:31:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 23 18:31:36 2014 +0000
tree 38928a624bd237551d5161b36001c9b05a058d11
parent 4f3afa6039081b32dac15652dfa3592d66f2014e
parent 44e2be10f6e8748a52a913942f067a01f865fb2e

am c8c398e1: am fb28414b: am d0868c89: Implement VpnService.setBlocking().

* commit 'c8c398e192a565811e7e1e4a0e3d54aa0fe7c852':
  Implement VpnService.setBlocking().

core/java/android/net/VpnService.java

diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
index 0967fa8..3fd415f 100644
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -577,7 +577,7 @@
          * @return this {@link Builder} object to facilitate chaining method calls.
          */
         public Builder setBlocking(boolean blocking) {
-            // TODO
+            mConfig.blocking = blocking;
             return this;
         }
 

core/java/com/android/internal/net/VpnConfig.java

diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java
index 73d3738..c552a41 100644
--- a/core/java/com/android/internal/net/VpnConfig.java
+++ b/core/java/com/android/internal/net/VpnConfig.java
@@ -73,6 +73,7 @@
     public PendingIntent configureIntent;
     public long startTime = -1;
     public boolean legacy;
+    public boolean blocking;
 
     public void addLegacyRoutes(String routesStr) {
         if (routesStr.trim().equals("")) {
@@ -120,6 +121,7 @@
         out.writeParcelable(configureIntent, flags);
         out.writeLong(startTime);
         out.writeInt(legacy ? 1 : 0);
+        out.writeInt(blocking ? 1 : 0);
     }
 
     public static final Parcelable.Creator<VpnConfig> CREATOR =
@@ -138,6 +140,7 @@
             config.configureIntent = in.readParcelable(null);
             config.startTime = in.readLong();
             config.legacy = in.readInt() != 0;
+            config.blocking = in.readInt() != 0;
             return config;
         }
 

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 7b68d55..4b5a2cb 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -77,6 +77,7 @@
 import com.android.server.net.BaseNetworkObserver;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
@@ -470,6 +471,13 @@
             if (oldInterface != null && !oldInterface.equals(interfaze)) {
                 jniReset(oldInterface);
             }
+
+            try {
+                IoUtils.setBlocking(tun.getFileDescriptor(), config.blocking);
+            } catch (IOException e) {
+                throw new IllegalStateException(
+                        "Cannot set tunnel's fd as blocking=" + config.blocking, e);
+            }
         } catch (RuntimeException e) {
             IoUtils.closeQuietly(tun);
             agentDisconnect();