| commit | 65f31d8ddc9583ab5dd334a9c39fcda729b5bb40 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Nov 24 21:19:55 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 24 21:19:56 2014 +0000 |
| tree | 7589dee744e48cf607aad3be94ddf323037c3d24 | |
| parent | d8b132b7b26cc3e6b75387c9d91dea2fb150eacf [diff] | |
| parent | 2b1cc9574c2514a50b8ab65a89bf738258cc3d2a [diff] |
Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index c935cbf..8b3739d 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2776,7 +2776,7 @@ } /** - * Prepare for a VPN application. This method is used by system-privileged apps. + * Prepare for a VPN application. * Permissions are checked in Vpn class. * @hide */