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

Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4

Browse Source 
am: 5949912523

Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
This commit is contained in:
Benedict Wong
2017-12-20 18:42:26 +00:00
committed by android-build-merger
parent 073572a677 1768744a3d
commit ad2180c3ba
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/IpSecService.java
View File

@@ -988,12 +988,6 @@ public class IpSecService extends IIpSecService.Stub {
sockFd = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); sockFd = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
mUidFdTagger.tag(sockFd, callingUid); mUidFdTagger.tag(sockFd, callingUid);
if (port != 0) {
Log.v(TAG, "Binding to port " + port);
Os.bind(sockFd, INADDR_ANY, port);
} else {
port = bindToRandomPort(sockFd);
}
// This code is common to both the unspecified and specified port cases // This code is common to both the unspecified and specified port cases
Os.setsockoptInt( Os.setsockoptInt(
sockFd, sockFd,
@@ -1001,6 +995,14 @@ public class IpSecService extends IIpSecService.Stub {
OsConstants.UDP_ENCAP, OsConstants.UDP_ENCAP,
OsConstants.UDP_ENCAP_ESPINUDP); OsConstants.UDP_ENCAP_ESPINUDP);
mSrvConfig.getNetdInstance().ipSecSetEncapSocketOwner(sockFd, callingUid);
if (port != 0) {
Log.v(TAG, "Binding to port " + port);
Os.bind(sockFd, INADDR_ANY, port);
} else {
port = bindToRandomPort(sockFd);
}
userRecord.mEncapSocketRecords.put( userRecord.mEncapSocketRecords.put(
resourceId, resourceId,
new RefcountedResource<EncapSocketRecord>( new RefcountedResource<EncapSocketRecord>(