Merge "Make failure to set addrgenmode a non-fatal error."

am: 9c170157a8 Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee
2017-07-10 13:43:02 +00:00
parent 03e304e4e8 9c170157a8
commit 97e7afe8d0
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
@@ -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);
            }
        }
    }