commit 5cce783b4176a90de26f408fd03e51816ca278b3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 17 14:19:32 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 17 14:19:32 2020 +0000
tree b38571882edbd7b37d7fa4bf8665f9a0475d23e0
parent 88f04a19df7359060e9dbd9c228307fc806458d2
parent 6c2b7cc4bd8c798201da58a24908b924a2dcfe1d

Merge "Catch correct exception for adding route fail" am: c2050ac731 am: 55c0f41695 am: b6589dc1f6

Change-Id: Ie79acf53b0cdb532f81d4e61e669bdb101b71c0a

Tethering/src/android/net/ip/IpServer.java

diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java
index f39e7af..2653b6d 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -756,7 +756,7 @@
                 final IpPrefix ipv4Prefix = new IpPrefix(mIpv4Address.getAddress(),
                         mIpv4Address.getPrefixLength());
                 NetdUtils.tetherInterface(mNetd, mIfaceName, ipv4Prefix);
-            } catch (RemoteException | ServiceSpecificException e) {
+            } catch (RemoteException | ServiceSpecificException | IllegalStateException e) {
                 mLog.e("Error Tethering: " + e);
                 mLastError = TetheringManager.TETHER_ERROR_TETHER_IFACE_ERROR;
                 return;