summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sehee Park <sehee32.park@samsung.com> 2018-07-02 06:23:35 -0700
committer android-build-merger <android-build-merger@google.com> 2018-07-02 06:23:35 -0700
commitc7b925063fec834b0b9a7a33540cf9d6f25906ed (patch)
treeb7540f39c14c6d0155087b35939b08a606337951
parenta916542011f8bdf714d892e2d2c69275a02bc2a6 (diff)
parentccd6a0f6c29c53ba204ad4f8d7ec29bfc4a8bf14 (diff)
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am: ccd6a0f6c2 Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
-rw-r--r--services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
index fbee86a84f85..9e6b659dbf93 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
@@ -379,7 +379,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
// that adding routes that already exist does not cause an
// error (EEXIST is silently ignored).
mNMService.addInterfaceToLocalNetwork(mIfaceName, toBeAdded);
- } catch (RemoteException e) {
+ } catch (Exception e) {
mLog.e("Failed to add IPv6 routes to local table: " + e);
}