Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""

Browse Source 
am: 8b560611bf

Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001
This commit is contained in:
Joel Scherpelz
2017-03-31 00:42:57 +00:00
committed by android-build-merger
parent fa9e00bde5 8b560611bf
commit a084e3283f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/net/java/android/net/ip/IpManager.java
View File

@@ -23,7 +23,6 @@ import android.content.Context;
import android.net.apf.ApfCapabilities;
import android.net.apf.ApfFilter;
import android.net.DhcpResults;
import android.net.INetd;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.LinkProperties;
@@ -35,12 +34,10 @@ import android.net.dhcp.DhcpClient;
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.IpManagerEvent;
import android.net.util.MultinetworkPolicyTracker;
import android.net.util.NetdService;
import android.os.INetworkManagementService;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceSpecificException;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.LocalLog;
@@ -1030,16 +1027,14 @@ public class IpManager extends StateMachine {
private boolean startIPv6() {
// Set privacy extensions.
final String PREFER_TEMPADDRS = "2";
try {
NetdService.run((INetd netd) -> {
netd.setProcSysNet(
INetd.IPV6, INetd.CONF, mInterfaceName, "use_tempaddr",
PREFER_TEMPADDRS);
});
mNwService.setInterfaceIpv6PrivacyExtensions(mInterfaceName, true);
mNwService.enableIpv6(mInterfaceName);
} catch (IllegalStateException|RemoteException|ServiceSpecificException e) {
logError("Unable to change interface settings: %s", e);
} catch (RemoteException re) {
logError("Unable to change interface settings: %s", re);
return false;
} catch (IllegalStateException ie) {
logError("Unable to change interface settings: %s", ie);
return false;
}