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

Merge "Lock down networking when waiting for always-on" into nyc-dev

Browse Source 
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
This commit is contained in:
Robin Lee
2016-05-18 23:42:40 +00:00
committed by android-build-merger
parent d2d8e9b228 d171df660e
commit 43fbfbf94c
6 changed files with 382 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/INetworkManagementService.aidl
View File

@@ -436,4 +436,6 @@ interface INetworkManagementService
void addInterfaceToLocalNetwork(String iface, in List<RouteInfo> routes);
void removeInterfaceFromLocalNetwork(String iface);
void setAllowOnlyVpnForUids(boolean enable, in UidRange[] uidRanges);
}

8
core/java/android/provider/Settings.java
View File

@@ -4712,6 +4712,14 @@ public final class Settings {
*/
public static final String ALWAYS_ON_VPN_APP = "always_on_vpn_app";
/**
* Whether to block networking outside of VPN connections while always-on is set.
* @see #ALWAYS_ON_VPN_APP
*
* @hide
*/
public static final String ALWAYS_ON_VPN_LOCKDOWN = "always_on_vpn_lockdown";
/**
* Whether applications can be installed for this user via the system's
* {@link Intent#ACTION_INSTALL_PACKAGE} mechanism.