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

am 8843620c: Merge change 25360 into eclair

Browse Source 
Merge commit '8843620cb208904bb9583809c9cfbe9e41264ae0' into eclair-plus-aosp

* commit '8843620cb208904bb9583809c9cfbe9e41264ae0':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
This commit is contained in:
Dianne Hackborn
2009-09-17 08:42:13 -07:00
committed by Android Git Automerger
parent 3ce9730848 8843620cb2
commit ca1475a868
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/AndroidTests/src/com/android/unit_tests/os/HandlerThreadTest.java
View File

@@ -36,8 +36,11 @@ public class HandlerThreadTest extends TestCase {
public void testHandlerThread() throws Exception { public void testHandlerThread() throws Exception {
HandlerThread th1 = new HandlerThread("HandlerThreadTest") { HandlerThread th1 = new HandlerThread("HandlerThreadTest") {
protected void onLooperPrepared() { protected void onLooperPrepared() {
mDidSetup = true; synchronized (HandlerThreadTest.this) {
mLooperTid = Process.myTid(); mDidSetup = true;
mLooperTid = Process.myTid();
HandlerThreadTest.this.notify();
}
} }
}; };
@@ -49,14 +52,23 @@ public class HandlerThreadTest extends TestCase {
assertTrue(th1.isAlive()); assertTrue(th1.isAlive());
assertNotNull(th1.getLooper()); assertNotNull(th1.getLooper());
/* // The call to getLooper() internally blocks until the looper is
* Since getLooper() will block until the HandlerThread is setup, we are guaranteed // available, but will call onLooperPrepared() after that. So we
* that mDidSetup and mLooperTid will have been initalized. If they have not, then // need to block here to wait for our onLooperPrepared() to complete
* this test should fail // and fill in the values we expect.
*/ synchronized (this) {
while (!mDidSetup) {
try {
wait();
} catch (InterruptedException e) {
}
}
}
// Make sure that the process was set.
assertNotSame(-1, mLooperTid);
// Make sure that the onLooperPrepared() was called on a different thread. // Make sure that the onLooperPrepared() was called on a different thread.
assertNotSame(Process.myTid(), mLooperTid); assertNotSame(Process.myTid(), mLooperTid);
assertTrue(mDidSetup);
final Handler h1 = new Handler(th1.getLooper()) { final Handler h1 = new Handler(th1.getLooper()) {
public void handleMessage(Message msg) { public void handleMessage(Message msg) {