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

Merge "Return not supported if no necessary socket option"

Browse Source
This commit is contained in:
Mark Chien
2019-03-04 09:16:07 +00:00
committed by Gerrit Code Review
parent 37cde6b81d 822935397c
commit acb289f34e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/connectivity/TcpKeepaliveController.java
View File

@@ -16,10 +16,12 @@
package com.android.server.connectivity; package com.android.server.connectivity;
import static android.net.SocketKeepalive.DATA_RECEIVED; import static android.net.SocketKeepalive.DATA_RECEIVED;
import static android.net.SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;
import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET; import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET;
import static android.net.SocketKeepalive.ERROR_SOCKET_NOT_IDLE; import static android.net.SocketKeepalive.ERROR_SOCKET_NOT_IDLE;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR; import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT; import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT;
import static android.system.OsConstants.ENOPROTOOPT;
import static android.system.OsConstants.FIONREAD; import static android.system.OsConstants.FIONREAD;
import static android.system.OsConstants.IPPROTO_TCP; import static android.system.OsConstants.IPPROTO_TCP;
import static android.system.OsConstants.TIOCOUTQ; import static android.system.OsConstants.TIOCOUTQ;
@@ -179,12 +181,13 @@ public class TcpKeepaliveController {
trw = NetworkUtils.getTcpRepairWindow(fd); trw = NetworkUtils.getTcpRepairWindow(fd);
} catch (ErrnoException e) { } catch (ErrnoException e) {
Log.e(TAG, "Exception reading TCP state from socket", e); Log.e(TAG, "Exception reading TCP state from socket", e);
try { if (e.errno == ENOPROTOOPT) {
Os.setsockoptInt(fd, IPPROTO_TCP, TCP_REPAIR, TCP_REPAIR_OFF); // ENOPROTOOPT may happen in kernel version lower than 4.8.
} catch (ErrnoException ex) { // Treat it as ERROR_HARDWARE_UNSUPPORTED.
Log.e(TAG, "Exception while turning off repair mode due to exception", ex); throw new InvalidSocketException(ERROR_HARDWARE_UNSUPPORTED, e);
} } else {
throw new InvalidSocketException(ERROR_INVALID_SOCKET, e); throw new InvalidSocketException(ERROR_INVALID_SOCKET, e);
}
} finally { } finally {
dropAllIncomingPackets(fd, false); dropAllIncomingPackets(fd, false);
} }