LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb am: 4116cd5901

Browse Source 
Original change: undetermined

Change-Id: I615ffcd553b93022273f3d422dc1b2919c37348c
This commit is contained in:
Hung-ying Tyan
2021-05-31 11:02:01 +00:00
committed by Automerger Merge Worker
parent 3e7f9f377a 4116cd5901
commit 74c5cc70e9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/ConnectivityService.java
View File

@@ -32,6 +32,7 @@ import android.net.NetworkStateTracker;
import android.net.NetworkUtils;
import android.net.Proxy;
import android.net.ProxyProperties;
import android.net.vpn.VpnManager;
import android.net.wifi.WifiStateTracker;
import android.os.Binder;
import android.os.Handler;
@@ -442,6 +443,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mSettingsObserver.observe(mContext);
loadGlobalProxy();
VpnManager.startVpnService(context);
}