summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-07-10 12:15:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-07-10 12:15:47 +0000
commit9c170157a88f05bca60bb248307f5eca2560c35b (patch)
treee826694d0a489a72dbb62c330e8e62e3fb538081
parentc895fcef8fe28c8b7a945ab8684757115267838b (diff)
parent00886760d7416940b76f34ad107ecd544715e914 (diff)
Merge "Make failure to set addrgenmode a non-fatal error."
-rw-r--r--services/net/java/android/net/ip/IpManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index 9de4ba4d72df..b2930a4d536d 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -1064,7 +1064,7 @@ public class IpManager extends StateMachine {
mNwService.setIPv6AddrGenMode(mInterfaceName, mConfiguration.mIPv6AddrGenMode);
} catch (ServiceSpecificException e) {
if (e.errorCode != OsConstants.EOPNOTSUPP) {
- throw e;
+ logError("Unable to set IPv6 addrgen mode: %s", e);
}
}
}