diff options
| author | Neil Fuller <nfuller@google.com> | 2016-09-19 12:00:42 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-09-19 19:04:52 +0100 |
| commit | 393a0c10b47ccbe72ca91c2b3e2b997cbc682011 (patch) | |
| tree | 8a2b598fe679d2d618be8581b0a34d9e0a0f7cec /annotations/generate_annotated_java_files.py | |
| parent | e6a7dec3721603a09a684e3e9030539d630ba465 (diff) | |
Fix DatagramSocket.disconnect()
Fix DatagramSocket.disconnect() in the case where an exception has
been thrown during connect().
commit 6764aa32a4b66a3c589f4a00615a1e36d87f308f introduced a bug
because it would leave connectState as ST_CONNECTED when
connect() failed. The correct state in this case appears to be
ST_CONNECTED_NO_IMPL instead (which is then dealt with correctly
by disconnect()).
This change rearranges the Android changes over upstream to make it
closer to upstream and try to make it clearer what state is guaranteed
after an exception is thrown.
Test: Ran CtsLibcoreTestCases
Bug: 31218085
(cherry picked from commit 979fbd7f58c33df7534cbc10a31cfc6aea85aac2)
Change-Id: I8b8e595a8c160b9dbc3450ae20da1be5fb91f47c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions