Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev

2017-07-15 19:38:00 +00:00
parent 43e249ff27 16f8384fe3
commit 90bf56da0d
1 changed files with 1 additions and 1 deletions
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -1065,7 +1065,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);
            }
        }
    }