Merge changes Idf0cfee8,I27307e2e into nyc-dev am: 7d0e392

am: e77e70d

* commit 'e77e70d00f3da6dd856f2d641d46080fbebacd0a':
  Use native netd binder interface in NetworkManagementService.
  Fix IdleableHandlerThread.

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

@@ -161,9 +161,11 @@ public class ConnectivityServiceTest extends AndroidTestCase {
                 assertNull("BUG: only one idle handler allowed", mIdleHandler);
                 mIdleHandler = new IdleHandler() {
                     public boolean queueIdle() {
-                        cv.open();
+                        synchronized (queue) {
-                        mIdleHandler = null;
+                            cv.open();
-                        return false;  // Remove the handler.
+                            mIdleHandler = null;
+                            return false;  // Remove the handler.
+                        }
                     }
                 };
                 queue.addIdleHandler(mIdleHandler);