Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 879505 - Use getCurrentActivity() in getActivityFromClick(). r=gbrown

Browse Source
This commit is contained in:
Brian Nicholson 2013-06-10 15:37:39 -07:00
parent 2253ea3ef7
commit 25612b1b66
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/tests/BaseTest.java.in
View File

@ -173,19 +173,15 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
mAsserter.ok(clicked != false, "checking that awesome bar clicked", "awesome bar was clicked");
return null;
}
// Wait for click to take effect before waiting for activity
// (otherwise we sometimes get the previous activity).
// Previously, waitForIdleSync was used here but it was found
// to hang very occasionally.
mSolo.sleep(2000);
Activity activity = inst.waitForMonitor(monitor);
inst.waitForMonitor(monitor);
// Give the activity time to render itself and initialize views
// before continuing, so that views are created before access
// attempts are made. Again, waitForIdleSync was used here
// previously, but replaced with a sleep to avoid hangs.
// TODO: Investigate and document why these pauses are required.
mSolo.sleep(2000);
return activity;
return mSolo.getCurrentActivity();
}
/**