Merge "Clarify UDP encapsulation socket API"

2018-03-30 04:58:47 +00:00
parent 857952d498 50b0ab8086
commit 0cf9421304
2 changed files with 4 additions and 4 deletions
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -931,7 +931,7 @@ public class IpSecService extends IIpSecService.Stub {
            return mPort;
        }

-        public FileDescriptor getSocket() {
+        public FileDescriptor getFileDescriptor() {
            return mSocket;
        }