| commit | c3a9529c5855fa8ed648be22de9130aafd5f9ee5 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Mar 12 10:00:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 10:00:57 2021 +0000 |
| tree | 5774a9b6515c865d787d71078ce58b642eb0bf7c | |
| parent | a9a58051fdcb0de363b44899e4ddc87152253523 [diff] | |
| parent | b392e8ffa6f5db7c91877f62ca94873e1de61cfe [diff] |
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8 am: b392e8ffa6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If44709876c213ef752b1dc94ea64f5b4690ff42f
diff --git a/framework/src/android/net/QosSocketInfo.java b/framework/src/android/net/QosSocketInfo.java index 3bf700b..53d9669 100644 --- a/framework/src/android/net/QosSocketInfo.java +++ b/framework/src/android/net/QosSocketInfo.java
@@ -114,10 +114,10 @@ try { return new InetSocketAddress(InetAddress.getByAddress(address), port); } catch (final UnknownHostException e) { - /* The catch block was purposely left empty. UnknownHostException will never be thrown + /* This can never happen. UnknownHostException will never be thrown since the address provided is numeric and non-null. */ + throw new RuntimeException("UnknownHostException on numeric address", e); } - return new InetSocketAddress(); } @Override