squashed commit of the following: commit e2c2d1c09475ce2e319b935fb5627c82a7693a9b Author: Guang Zhu <guangzhu@google.com> Date: Mon Apr 20 13:33:08 2009 -0700 modify wait mechanism so that it checks whether activity has already finished or not first This reverts commit deb6e8792dd563916724bbc127a6fe16ffe81647. commit deb6e8792dd563916724bbc127a6fe16ffe81647 Author: Guang Zhu <guangzhu@google.com> Date: Mon Apr 20 10:58:52 2009 -0700 changed callback mechanism in TestShellActivity to use condition