diff options
| author | Neil Fuller <nfuller@google.com> | 2016-09-19 12:00:42 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-09-19 14:35:17 +0100 |
| commit | 979fbd7f58c33df7534cbc10a31cfc6aea85aac2 (patch) | |
| tree | 53e8dfe6260893d2160957bdb7d4491175c6a6bb /annotations/generate_annotated_java_files.py | |
| parent | 5afe372209598256878543d27f4124fde0ad6379 (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
Change-Id: Ife3aba579b77fd05c64244c1aa5a6cb2ea7b304a
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions