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

Cleanup Netd to prevent getting hung.

Browse Source 
If the sending of the command fails we should note it and not wait forever
for the response.

We should also not say we're ready until we actually are.

bug:2993205
Change-Id: I380f0312ac4693ad184a526b330fdfa23f6ac558
This commit is contained in:
Robert Greenwalt
2010-09-22 14:32:35 -07:00
parent b2044da3f9
commit e5c3afb292
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/java/com/android/server/NetworkManagementService.java
View File

@@ -47,6 +47,7 @@ import java.lang.IllegalStateException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.concurrent.CountDownLatch;
/**
* @hide
@@ -54,7 +55,7 @@ import java.net.UnknownHostException;
class NetworkManagementService extends INetworkManagementService.Stub {
private static final String TAG = "NetworkManagmentService";
private static final boolean DBG = true;
private static final String NETD_TAG = "NetdConnector";
class NetdResponseCode {
@@ -86,6 +87,9 @@ class NetworkManagementService extends INetworkManagementService.Stub {
*/
private NativeDaemonConnector mConnector;
private Thread mThread;
private final CountDownLatch mConnectedSignal = new CountDownLatch(1);
private ArrayList<INetworkManagementEventObserver> mObservers;
/**
@@ -93,9 +97,8 @@ class NetworkManagementService extends INetworkManagementService.Stub {
*
* @param context Binder context for this service
*/
public NetworkManagementService(Context context) {
private NetworkManagementService(Context context) {
mContext = context;
mObservers = new ArrayList<INetworkManagementEventObserver>();
if ("simulator".equals(SystemProperties.get("ro.product.device"))) {
@@ -104,8 +107,17 @@ class NetworkManagementService extends INetworkManagementService.Stub {
mConnector = new NativeDaemonConnector(
new NetdCallbackReceiver(), "netd", 10, NETD_TAG);
Thread thread = new Thread(mConnector, NETD_TAG);
thread.start();
mThread = new Thread(mConnector, NETD_TAG);
}
public static NetworkManagementService create(Context context) throws InterruptedException {
NetworkManagementService service = new NetworkManagementService(context);
if (DBG) Slog.d(TAG, "Creating NetworkManagementService");
service.mThread.start();
if (DBG) Slog.d(TAG, "Awaiting socket connection");
service.mConnectedSignal.await();
if (DBG) Slog.d(TAG, "Connected");
return service;
}
public void registerObserver(INetworkManagementEventObserver obs) {
@@ -157,6 +169,14 @@ class NetworkManagementService extends INetworkManagementService.Stub {
}
}
/**
* Let us know the daemon is connected
*/
protected void onConnected() {
if (DBG) Slog.d(TAG, "onConnected");
mConnectedSignal.countDown();
}
//
// Netd Callback handling
@@ -164,6 +184,7 @@ class NetworkManagementService extends INetworkManagementService.Stub {
class NetdCallbackReceiver implements INativeDaemonConnectorCallbacks {
public void onDaemonConnected() {
NetworkManagementService.this.onConnected();
new Thread() {
public void run() {
}