Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-17 14:11:55 +00:00
committed by Android (Google) Code Review
parent 17e641dae5 28a3e85903
commit ca007e525b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/VpnService.java
View File

@@ -99,7 +99,7 @@ import java.util.List;
* shut down the tunnel gracefully.</li> * shut down the tunnel gracefully.</li>
* </ol> * </ol>
* *
* <p>Services extended this class need to be declared with appropriate * <p>Services extending this class need to be declared with an appropriate
* permission and intent filter. Their access must be secured by * permission and intent filter. Their access must be secured by
* {@link android.Manifest.permission#BIND_VPN_SERVICE} permission, and * {@link android.Manifest.permission#BIND_VPN_SERVICE} permission, and
* their intent filter must match {@link #SERVICE_INTERFACE} action. Here * their intent filter must match {@link #SERVICE_INTERFACE} action. Here
@@ -112,6 +112,13 @@ import java.util.List;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* &lt;/service&gt;</pre> * &lt;/service&gt;</pre>
* *
* <p> The Android system starts a VPN in the background by calling
* {@link android.content.Context#startService startService()}. In Android 8.0
* (API level 26) and higher, the system places VPN apps on the temporary
* whitelist for a short period so the app can start in the background. The VPN
* app must promote itself to the foreground after it's launched or the system
* will shut down the app.
*
* @see Builder * @see Builder
*/ */
public class VpnService extends Service { public class VpnService extends Service {