Commit 9004e728 authored Jul 10, 2017 by Lorenzo Colitti Committed by android-build-merger Jul 10, 2017

Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157 am:...

Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157 am: 97e7afe8 am: 856a8873
am: d8c0e9f2

Change-Id: Iae28dd9448ad6efdc51b80637ba9c9ce8bd66d43

parents a2c84e7a d8c0e9f2

services/net/java/android/net/ip/IpManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}