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

VPN: convert prepare() into a form which helps solve race conditions. am: 3e2e1da0a0

Browse Source 
Original change: undetermined

Change-Id: Ife986c73bbc4468acb61d08f94d59400ed627371
This commit is contained in:
Chia-chi Yeh
2021-05-31 11:42:55 +00:00
committed by Automerger Merge Worker
parent 181aa5c2a3 3e2e1da0a0
commit fda32f27a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -101,7 +101,7 @@ interface IConnectivityManager
void protectVpn(in ParcelFileDescriptor socket);
String prepareVpn(String packageName);
boolean prepareVpn(String oldPackage, String newPackage);
ParcelFileDescriptor establishVpn(in VpnConfig config);

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

@@ -2485,8 +2485,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* @hide
*/
@Override
public String prepareVpn(String packageName) {
return mVpn.prepare(packageName);
public boolean prepareVpn(String oldPackage, String newPackage) {
return mVpn.prepare(oldPackage, newPackage);
}
/**