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

am: e77e70d

* commit 'e77e70d00f3da6dd856f2d641d46080fbebacd0a':
  Use native netd binder interface in NetworkManagementService.
  Fix IdleableHandlerThread.
This commit is contained in:
Lorenzo Colitti
2016-03-17 19:09:06 +00:00
committed by android-build-merger

View File

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