summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/VpnService.java
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-03-10 10:54:12 -0400
committerPaul Jensen <pauljensen@google.com>2015-04-02 14:03:43 +0000
commit72db88e46fba5f2581eb21c042dc79887cda1c10 (patch)
treee515e6bb9ad29933a7d1839ea58c1fd7b1bd1279 /core/java/android/net/VpnService.java
parent1b6be18b2d4a822110182d06335e4d6c0ad8ba54 (diff)
downloadframeworks_base-72db88e46fba5f2581eb21c042dc79887cda1c10.zip
frameworks_base-72db88e46fba5f2581eb21c042dc79887cda1c10.tar.gz
frameworks_base-72db88e46fba5f2581eb21c042dc79887cda1c10.tar.bz2
Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.
These functions risk hitting an unchecked Exception due to ConnectivityManager not being instantiated yet. Also, change Network.openConnection() to throw a checked Exception rather than an unchecked Exception when ConnectivityManager is not yet instantiated. bug:19416463 Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85
Diffstat (limited to 'core/java/android/net/VpnService.java')
-rw-r--r--core/java/android/net/VpnService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
index c26af06..a0e65eb 100644
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -679,7 +679,7 @@ public class VpnService extends Service {
*
* By default, all traffic from apps is forwarded through the VPN interface and it is not
* possible for apps to side-step the VPN. If this method is called, apps may use methods
- * such as {@link ConnectivityManager#setProcessDefaultNetwork} to instead send/receive
+ * such as {@link ConnectivityManager#bindProcessToNetwork} to instead send/receive
* directly over the underlying network or any other network they have permissions for.
*
* @return this {@link Builder} object to facilitate chaining of method calls.